From 4f34be855a427e9edd4e27cfd4638b0c187ce1d6 Mon Sep 17 00:00:00 2001 From: David Spencer Date: Sat, 23 Jan 2016 15:55:36 +0000 Subject: [PATCH] development/julia: Fixed i686 build, updated DOWNLOAD & MD5SUM. Thanks to B Watson. Signed-off-by: David Spencer --- development/julia/julia.SlackBuild | 31 ++++++------------------------ development/julia/julia.info | 4 ++-- 2 files changed, 8 insertions(+), 27 deletions(-) diff --git a/development/julia/julia.SlackBuild b/development/julia/julia.SlackBuild index e3d2af1bc4..1e474f40fb 100644 --- a/development/julia/julia.SlackBuild +++ b/development/julia/julia.SlackBuild @@ -28,37 +28,18 @@ VERSION_TAG=${VERSION_TAG:-b24213b893} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i486 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi +ARCH=${ARCH:-$(uname -m)} +case "$ARCH" in + i?86) ARCH=i686; LIBDIRSUFFIX="" ;; + x86_64) LIBDIRSUFFIX="64" ;; + *) echo "$ARCH is not supported"; exit 1 ;; +esac CWD=$(pwd) TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" - ARCH=i386 -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" - ARCH=i386 -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" - ARCH=x86_64 -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" - ARCH=i386 -fi - set -e rm -rf $PKG diff --git a/development/julia/julia.info b/development/julia/julia.info index 984a87a1d7..1dd84b378c 100644 --- a/development/julia/julia.info +++ b/development/julia/julia.info @@ -1,8 +1,8 @@ PRGNAM="julia" VERSION="0.3.3" HOMEPAGE="http://julialang.org" -DOWNLOAD="https://julialang.s3.amazonaws.com/bin/linux/x86/0.3/julia-0.3.3-linux-i386.tar.gz" -MD5SUM="b6af0cf30a80d753520d0942ef551bf6" +DOWNLOAD="https://julialang.s3.amazonaws.com/bin/linux/x86/0.3/julia-0.3.3-linux-i686.tar.gz" +MD5SUM="4bd53b8daaa1a99b0b040fd07a2e3846" DOWNLOAD_x86_64="https://julialang.s3.amazonaws.com/bin/linux/x64/0.3/julia-0.3.3-linux-x86_64.tar.gz" MD5SUM_x86_64="84138ce908792e22a3a5cc2e48e420b9" REQUIRES=""