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

[Alexander Rødseth]

    Date: Wednesday, February 7, 2018 @ 10:14:47
  Author: arodseth
Revision: 289957

upgpkg: julia 2:0.6.2-2

Modified:
  julia/trunk/PKGBUILD

----------+
 PKGBUILD |   15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-02-07 09:40:53 UTC (rev 289956)
+++ PKGBUILD	2018-02-07 10:14:47 UTC (rev 289957)
@@ -9,12 +9,12 @@
 pkgname=('julia' 'julia-docs')
 epoch=2
 pkgver=0.6.2
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 pkgdesc='High-level, high-performance, dynamic programming language'
 url='https://julialang.org/'
 license=('MIT')
-makedepends=('arpack' 'cmake' 'fftw' 'gcc-fortran' 'gmp' 'libgit2' 'libunwind' 'llvm39' 'mpfr' 'patchelf' 'pcre2' 'python2' 'suitesparse')
+makedepends=('arpack' 'cmake' 'fftw' 'gcc-fortran' 'gmp' 'libgit2' 'libunwind' 'mpfr' 'patchelf' 'pcre2' 'python2' 'suitesparse')
 options=('!emptydirs' 'staticlibs')
 source=("https://github.com/JuliaLang/$pkgbase/releases/download/v$pkgver/$pkgbase-$pkgver-full.tar.gz"{,.asc}
         julia-libunwind-version.patch
@@ -31,7 +31,6 @@
 
   cd "$pkgbase-$pkgver"
   patch -p1 -i ../julia-libunwind-version.patch
-  sed -e 's|-lLLVM|-lLLVM-3.9|' -i src/Makefile # link against llvm39
   patch -p0 -i ../julia-makefile.patch # make 'make install' really just install
 }
 
@@ -42,12 +41,14 @@
 
   unset ARCH
 
+  # See FS#57387 for why SYSTEM_LLVM=0, for now
+
   make -C "$pkgbase-$pkgver" \
     prefix=/usr \
     sysconfdir=/etc \
     MARCH="x86-64" \
     JULIA_BUILD_MODE=release \
-    USE_SYSTEM_LLVM=1 \
+    USE_SYSTEM_LLVM=0 \
     USE_SYSTEM_LIBUNWIND=1 \
     USE_SYSTEM_PCRE=1 \
     USE_SYSTEM_LIBM=1 \
@@ -72,7 +73,7 @@
 
 package_julia() {
   backup=('etc/ld.so.conf.d/julia.conf' 'etc/julia/juliarc.jl')
-  depends=('arpack' 'fftw' 'hicolor-icon-theme' 'libgit2' 'libunwind' 'llvm39-libs' 'mpfr' 'patchelf' 'pcre2' 'suitesparse')
+  depends=('arpack' 'fftw' 'hicolor-icon-theme' 'libgit2' 'libunwind' 'mpfr' 'patchelf' 'pcre2' 'suitesparse')
   optdepends=('gnuplot: If using the Gaston Package from julia')
   install='sysfix.install'
 
@@ -82,12 +83,14 @@
 
   unset ARCH
 
+  # See FS#57387 for why SYSTEM_LLVM=0, for now
+
   make -C "$pkgbase-$pkgver" \
     DESTDIR="$pkgdir" \
     prefix=/usr \
     sysconfdir=/etc  \
     MARCH="x86-64" \
-    USE_SYSTEM_LLVM=1 \
+    USE_SYSTEM_LLVM=0 \
     USE_SYSTEM_LIBUNWIND=1 \
     USE_SYSTEM_PCRE=1 \
     USE_SYSTEM_LIBM=1 \