diff options
| author | Alexander Phinikarides | 2018-06-04 09:07:22 +0300 |
|---|---|---|
| committer | Alexander Phinikarides | 2018-06-04 09:10:22 +0300 |
| commit | 9e82c22e5eebb5bcefcb3cbcb79f2b4c7b9f1974 (patch) | |
| tree | 093961add9dd13602eaed9e1721cd53235473580 | |
| parent | 98b3eb0f12f5ea59794b72f9b3211d53f22d5b87 (diff) | |
| download | aur-9e82c22e5eebb5bcefcb3cbcb79f2b4c7b9f1974.tar.gz | |
update provides and conflicts arrays
| -rw-r--r-- | .SRCINFO | 5 | ||||
| -rw-r--r-- | PKGBUILD | 8 |
2 files changed, 7 insertions, 6 deletions
@@ -1,7 +1,7 @@ pkgbase = r-mkl pkgdesc = Language and environment for statistical computing and graphics, linked to the Intel(R) MKL. pkgver = 3.5.0 - pkgrel = 1 + pkgrel = 2 url = http://www.r-project.org/ install = r-mkl.install arch = x86_64 @@ -34,8 +34,9 @@ pkgbase = r-mkl depends = zlib optdepends = texlive-bin: LaTeX sty files optdepends = tk: tcl-tk interface - provides = r=3.5.0,r-mkl=3.5.0 + provides = r=3.5.0 conflicts = r + conflicts = microsoft-r-open options = !makeflags options = !emptydirs backup = etc/R/Makeconf @@ -5,13 +5,13 @@ pkgname=r-mkl pkgver=3.5.0 -pkgrel=1 +pkgrel=2 pkgdesc="Language and environment for statistical computing and graphics, linked to the Intel(R) MKL." arch=('x86_64') license=('GPL') url='http://www.r-project.org/' -provides=("r=${pkgver}","r-mkl=${pkgver}") -conflicts=('r') +provides=("r=${pkgver}") +conflicts=('r' 'microsoft-r-open') depends=('intel-mkl' 'intel-compiler-base' 'intel-fortran-compiler' @@ -88,7 +88,7 @@ build() { # Set up the environment for MKL source /opt/intel/mkl/bin/mklvars.sh ${_intel_arch} - if [ $_CC = "icc" ]; then + if [[ $_CC = "icc" ]]; then source ${MKLROOT}/../bin/compilervars.sh ${_intel_arch} source ${MKLROOT}/../tbb/bin/tbbvars.sh ${_intel_arch} _intel_cc_opt=" -O3 -ipo -qno-openmp -xHost -fPIC -m64 -march=native -fp-model precise -fp-model source" |