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

[Alexander Rødseth]

    Date: Thursday, September 22, 2016 @ 14:53:07
  Author: arodseth
Revision: 190157

upgpkg: julia 2:0.5.0-1

Modified:
  julia/trunk/PKGBUILD

----------+
 PKGBUILD |   26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-09-22 14:02:37 UTC (rev 190156)
+++ PKGBUILD	2016-09-22 14:53:07 UTC (rev 190157)
@@ -7,7 +7,7 @@
 
 pkgbase=julia
 pkgname=('julia' 'julia-docs')
-pkgver=0.4.6
+pkgver=0.5.0
 pkgrel=1
 epoch=2
 arch=('x86_64' 'i686')
@@ -25,13 +25,18 @@
 }
 
 build() {
+  # Make sure not to set -march
+  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 JULIA_CPU_TARGET=pentium4
+    export M=pentium4
+  else
+    export M="x86-64"
   fi
-
   make -C "$pkgname" prefix=/usr sysconfdir=/etc \
-    MARCH=${CARCH/_/-} \
+    MARCH=$M \
     USE_SYSTEM_LLVM=0 \
     USE_SYSTEM_LIBUNWIND=1 \
     USE_SYSTEM_PCRE=1 \
@@ -61,9 +66,20 @@
   optdepends=('gnuplot: If using the Gaston Package from julia')
   install='sysfix.install'
 
+  # Make sure not to set -march
+  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
+  else
+    export M="x86-64"
+  fi
+
   make -C "$pkgname" DESTDIR="$pkgdir" \
     prefix=/usr sysconfdir=/etc  \
-    MARCH=${CARCH/_/-} \
+    MARCH=$M \
     USE_SYSTEM_LLVM=0 \
     USE_SYSTEM_LIBUNWIND=1 \
     USE_SYSTEM_PCRE=1 \