Date: Sunday, April 23, 2017 @ 08:42:34 Author: arojas Revision: 224571
Fix arch mismatch again (FS#53760) Modified: julia/trunk/PKGBUILD ----------+ PKGBUILD | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-04-23 07:56:51 UTC (rev 224570) +++ PKGBUILD 2017-04-23 08:42:34 UTC (rev 224571) @@ -8,7 +8,7 @@ pkgbase=julia pkgname=('julia' 'julia-docs') pkgver=0.5.1 -pkgrel=5 +pkgrel=6 epoch=2 arch=('x86_64' 'i686') pkgdesc='High-level, high-performance, dynamic programming language' @@ -33,13 +33,18 @@ export CXXFLAGS="-mtune=generic -O3 -pipe -fstack-protector-strong" # SSE2 is a requirement for Julia on 32-bit x86 + unset ARCH if [[ $CARCH == i686 ]]; then + export M="pentium4" export CFLAGS+=" -march=pentium4" export CXXFLAGS+=" -march=pentium4" + else + export M="x86-64" fi cd julia-$pkgver make prefix=/usr sysconfdir=/etc \ + MARCH=$M \ USE_SYSTEM_LLVM=1 \ USE_SYSTEM_LIBUNWIND=1 \ USE_SYSTEM_PCRE=1 \ @@ -75,13 +80,17 @@ # 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 cd julia-$pkgver make DESTDIR="$pkgdir" \ prefix=/usr sysconfdir=/etc \ + MARCH=$M \ USE_SYSTEM_LLVM=1 \ USE_SYSTEM_LIBUNWIND=1 \ USE_SYSTEM_PCRE=1 \