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

[Alexander Rødseth]

    Date: Tuesday, August 26, 2014 @ 13:52:24
  Author: arodseth
Revision: 117902

Fix for x86_64.

Modified:
  julia/trunk/PKGBUILD

----------+
 PKGBUILD |   12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-08-26 09:46:31 UTC (rev 117901)
+++ PKGBUILD	2014-08-26 11:52:24 UTC (rev 117902)
@@ -3,10 +3,11 @@
 # Contributor: Lex Black <autumn-wind at web dot de>
 # Contributor: Michael Jakl <jakl.michael at gmail.com>
 # Contributor: devmotion <nospam-archlinux.org at devmotion.de>
+# Contributor: Valentin Churavy <v.churavy at gmail.com>
 
 pkgname=julia
 pkgver=0.3.0
-pkgrel=1
+pkgrel=2
 epoch=2
 pkgdesc='High-level, high-performance, dynamic programming language'
 arch=('x86_64' 'i686')
@@ -13,7 +14,7 @@
 url='http://julialang.org'
 license=('GPL')
 depends=('arpack' 'fftw' 'git' 'gmp' 'libunwind' 'mpfr' 'pcre' 'zlib')
-makedepends=('gcc-fortran' 'python2' 'libuv' 'setconf')
+makedepends=('gcc-fortran' 'python2' 'libuv')
 optdepends=('gnuplot: If using the Gaston Package from julia')
 options=('!emptydirs' 'staticlibs')
 source=("git://github.com/JuliaLang/julia.git#tag=v${pkgver/_/-}")
@@ -20,13 +21,9 @@
 install=sysfix.install
 sha256sums=('SKIP')
 
-prepare() {
-  # Fix for FS#40736
-  [ $CARCH != x86_64 ] || (setconf "$pkgname/Make.inc" JULIA_CPU_TARGET core2)
-}
-
 build() {
   make -C "$pkgname" prefix=/usr sysconfdir=/etc \
+    MARCH=${CARCH/_/-} \
     USE_SYSTEM_LLVM=0 \
     USE_SYSTEM_LIBUNWIND=1 \
     USE_SYSTEM_READLINE=0 \
@@ -54,6 +51,7 @@
 package() {
   make -C "$pkgname" DESTDIR="$pkgdir" \
     prefix=/usr sysconfdir=/etc  \
+    MARCH=${CARCH/_/-} \
     USE_SYSTEM_LLVM=0 \
     USE_SYSTEM_LIBUNWIND=1 \
     USE_SYSTEM_READLINE=0 \