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

[Antonio Rojas]

    Date: Saturday, April 22, 2017 @ 18:18:30
  Author: arojas
Revision: 224415

Use system LLVM 3.9

Modified:
  julia/trunk/PKGBUILD

----------+
 PKGBUILD |   22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-04-22 18:15:21 UTC (rev 224414)
+++ PKGBUILD	2017-04-22 18:18:30 UTC (rev 224415)
@@ -8,13 +8,13 @@
 pkgbase=julia
 pkgname=('julia' 'julia-docs')
 pkgver=0.5.1
-pkgrel=4
+pkgrel=5
 epoch=2
 arch=('x86_64' 'i686')
 pkgdesc='High-level, high-performance, dynamic programming language'
 url='http://julialang.org/'
 license=('MIT')
-makedepends=('gcc-fortran' 'python2' 'libuv' 'blas' 'lapack' 'arpack' 'libunwind' 'fftw'
+makedepends=('gcc-fortran' 'python2' 'libuv' 'blas' 'lapack' 'arpack' 'libunwind' 'fftw' 'llvm39'
              'gmp' 'mpfr' 'zlib' 'suitesparse' 'patchelf' 'cmake' 'pcre2' 'libgit2' 'openssl')
 options=('!emptydirs' 'staticlibs')
 source=("https://github.com/JuliaLang/julia/releases/download/v$pkgver/julia-$pkgver.tar.gz"{,.asc})
@@ -34,15 +34,13 @@
 
   # 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 \
@@ -67,7 +65,7 @@
 
 package_julia() {
   backup=('etc/ld.so.conf.d/julia.conf' 'etc/julia/juliarc.jl')
-  depends=('arpack' 'fftw' 'libunwind' 'mpfr' 'suitesparse' 'pcre2' 'libgit2' 'llvm-libs' 'patchelf' 'hicolor-icon-theme')
+  depends=('arpack' 'fftw' 'libunwind' 'mpfr' 'suitesparse' 'pcre2' 'libgit2' 'llvm39-libs' 'patchelf' 'hicolor-icon-theme')
   optdepends=('gnuplot: If using the Gaston Package from julia')
   install='sysfix.install'
 
@@ -77,16 +75,14 @@
 
   # 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 \