[arch-commits] Commit in julia/trunk (PKGBUILD)

[Antonio Rojas]

    Date: Wednesday, March 15, 2017 @ 22:28:29
  Author: arojas
Revision: 216473

Use system LLVM (FS#53312)

Modified:
  julia/trunk/PKGBUILD

----------+
 PKGBUILD |   30 +++++++++++++-----------------
 1 file changed, 13 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-03-15 21:20:25 UTC (rev 216472)
+++ PKGBUILD	2017-03-15 22:28:29 UTC (rev 216473)
@@ -8,7 +8,7 @@
 pkgbase=julia
 pkgname=('julia' 'julia-docs')
 pkgver=0.5.1
-pkgrel=1
+pkgrel=2
 epoch=2
 arch=('x86_64' 'i686')
 pkgdesc='High-level, high-performance, dynamic programming language'
@@ -15,7 +15,7 @@
 url='http://julialang.org/'
 license=('MIT')
 makedepends=('gcc-fortran' 'python2' 'libuv' 'blas' 'lapack' 'arpack' 'libunwind' 'fftw'
-             'gmp' 'mpfr' 'zlib' 'suitesparse' 'patchelf' 'cmake' 'pcre2' 'libgit2' 'openssl')
+             'gmp' 'mpfr' 'zlib' 'suitesparse' 'patchelf' 'cmake' 'pcre2' 'libgit2' 'openssl' 'llvm')
 options=('!emptydirs' 'staticlibs')
 source=("https://github.com/JuliaLang/julia/releases/download/v$pkgver/julia-$pkgver.tar.gz"{,.asc})
 sha256sums=('805e97aef179fd5bea2bc906128369d113a30bb9a165cef70b67f2fc3f3c35a9'
@@ -34,21 +34,19 @@
 
   # SSE2 is a requirement for Julia on 32-bit x86
   if [[ $CARCH == i686 ]]; then
-    export M=pentium4
-  else
-    export M="x86-64"
+    export CFLAGS+=" -march=pentium4"
+    export CXXFLAGS+=" -march=pentium4"
   fi
 
   cd julia-$pkgver
   make prefix=/usr sysconfdir=/etc \
-    MARCH=$M \
-    USE_SYSTEM_LLVM=0 \
+    USE_SYSTEM_LLVM=1 \
     USE_SYSTEM_LIBUNWIND=1 \
     USE_SYSTEM_PCRE=1 \
     USE_SYSTEM_LIBM=1 \
     USE_SYSTEM_OPENLIBM=0 \
     USE_SYSTEM_OPENSPECFUN=0 \
-    USE_SYSTEM_BLAS=0 \
+    USE_SYSTEM_BLAS=1 \
     USE_SYSTEM_LAPACK=1 \
     USE_SYSTEM_FFTW=1 \
     USE_SYSTEM_GMP=1 \
@@ -59,7 +57,7 @@
     USE_SYSTEM_UTF8PROC=0 \
     USE_INTEL_MKL=0 \
     USE_BLAS64=0 \
-    USE_LLVM_SHLIB=0 \
+    USE_LLVM_SHLIB=1 \
     USE_SYSTEM_LIBGIT2=1 \
     USE_SYSTEM_PATCHELF=1 \
     USE_SYSTEM_DSFMT=0
@@ -67,7 +65,7 @@
 
 package_julia() {
   backup=('etc/ld.so.conf.d/julia.conf' 'etc/julia/juliarc.jl')
-  depends=('arpack' 'fftw' 'gmp' 'libunwind' 'mpfr' 'zlib' 'lapack' 'suitesparse' 'pcre2' 'libgit2' 'openssl' 'patchelf')
+  depends=('arpack' 'fftw' 'libunwind' 'mpfr' 'suitesparse' 'pcre2' 'libgit2' 'llvm-libs' 'patchelf' 'hicolor-icon-theme')
   optdepends=('gnuplot: If using the Gaston Package from julia')
   install='sysfix.install'
 
@@ -77,22 +75,20 @@
 
   # SSE2 is a requirement for Julia on 32-bit x86
   if [[ $CARCH == i686 ]]; then
-    export M=pentium4
-  else
-    export M="x86-64"
+    export CFLAGS+=" -march=pentium4"
+    export CXXFLAGS+=" -march=pentium4"
   fi
 
   cd julia-$pkgver
   make DESTDIR="$pkgdir" \
     prefix=/usr sysconfdir=/etc  \
-    MARCH=$M \
-    USE_SYSTEM_LLVM=0 \
+    USE_SYSTEM_LLVM=1 \
     USE_SYSTEM_LIBUNWIND=1 \
     USE_SYSTEM_PCRE=1 \
     USE_SYSTEM_LIBM=1 \
     USE_SYSTEM_OPENLIBM=0 \
     USE_SYSTEM_OPENSPECFUN=0 \
-    USE_SYSTEM_BLAS=0 \
+    USE_SYSTEM_BLAS=1 \
     USE_SYSTEM_LAPACK=1 \
     USE_SYSTEM_FFTW=1 \
     USE_SYSTEM_GMP=1 \
@@ -103,7 +99,7 @@
     USE_SYSTEM_UTF8PROC=0 \
     USE_INTEL_MKL=0 \
     USE_BLAS64=0 \
-    USE_LLVM_SHLIB=0 \
+    USE_LLVM_SHLIB=1 \
     USE_SYSTEM_LIBGIT2=1 \
     USE_SYSTEM_PATCHELF=1 \
     USE_SYSTEM_DSFMT=0 \