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

[Alexander Rødseth]

    Date: Thursday, November 16, 2017 @ 14:34:28
  Author: arodseth
Revision: 266966

upgpkg: julia 2:0.6.1-3

Modified:
  julia/trunk/PKGBUILD

----------+
 PKGBUILD |   31 ++++++++++++++-----------------
 1 file changed, 14 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-11-16 13:26:30 UTC (rev 266965)
+++ PKGBUILD	2017-11-16 14:34:28 UTC (rev 266966)
@@ -9,7 +9,7 @@
 pkgname=('julia' 'julia-docs')
 epoch=2
 pkgver=0.6.1
-pkgrel=2
+pkgrel=3
 arch=('x86_64')
 pkgdesc='High-level, high-performance, dynamic programming language'
 url='https://julialang.org/'
@@ -43,9 +43,9 @@
   unset ARCH
 
   make -C julia \
-    MARCH="x86-64" \
     prefix=/usr \
     sysconfdir=/etc \
+    MARCH="x86-64" \
     JULIA_BUILD_MODE=release \
     USE_SYSTEM_LLVM=1 \
     USE_SYSTEM_LIBUNWIND=1 \
@@ -80,19 +80,13 @@
   export CFLAGS="-mtune=generic -O3 -pipe -fstack-protector-strong"
   export CXXFLAGS="-mtune=generic -O3 -pipe -fstack-protector-strong"
 
-  # SSE2 is a requirement for Julia on 32-bit x86
-  if [[ $CARCH == i686 ]]; then
-    export M="pentium4"
-    export CFLAGS+=" -march=pentium4"
-    export CXXFLAGS+=" -march=pentium4"
-  else
-    export M="x86-64"
-  fi
+  unset ARCH
 
-  cd julia
-  make DESTDIR="$pkgdir" \
-    prefix=/usr sysconfdir=/etc  \
-    MARCH=$M \
+  make -C julia \
+    DESTDIR="$pkgdir" \
+    prefix=/usr \
+    sysconfdir=/etc  \
+    MARCH="x86-64" \
     USE_SYSTEM_LLVM=1 \
     USE_SYSTEM_LIBUNWIND=1 \
     USE_SYSTEM_PCRE=1 \
@@ -120,7 +114,7 @@
   rm -rvf "$pkgdir/usr/share/julia/doc/man"
 
   # For /etc/ld.so.conf.d, FS#41731
-  install -Dm644 "$srcdir"/julia.conf "$pkgdir/etc/ld.so.conf.d/julia.conf"
+  install -Dm644 "$srcdir/julia.conf" "$pkgdir/etc/ld.so.conf.d/julia.conf"
 
   # Documentation and examples are in the julia-docs package
   rm -rvf "$pkgdir/usr/share/doc/"
@@ -127,7 +121,8 @@
   rm -rvf "$pkgdir/usr/share/julia/doc/"
   rm -rvf "$pkgdir/usr/share/julia/examples/"
 
-  install -Dm644 LICENSE.md "$pkgdir/usr/share/licenses/$pkgname/LICENSE.md"
+  # License
+  install -Dm644 julia/LICENSE.md "$pkgdir/usr/share/licenses/$pkgname/LICENSE.md"
 
   # Minor improvement
   patchelf --set-rpath /usr/lib "$pkgdir/usr/bin/julia"
@@ -135,8 +130,10 @@
 
 package_julia-docs() {
   pkgdesc='Documentation and examples for Julia'
-  cd julia
+  arch=('any')
 
+  cd "$pkgbase"
+
   install -d "$pkgdir/usr/share/doc"
   cp -rv doc "$pkgdir/usr/share/doc/$pkgbase"
   cp -rv examples "$pkgdir/usr/share/doc/$pkgbase/examples"