1 files changed, 31 insertions, 10 deletions
diff --git a/development/julia/julia.SlackBuild b/development/julia/julia.SlackBuild
index 0a926d149a..b0cde170b3 100644
--- a/development/julia/julia.SlackBuild
+++ b/development/julia/julia.SlackBuild
@@ -23,23 +23,41 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=julia
-VERSION=${VERSION:-0.4.6}
-VERSION_TAG=${VERSION_TAG:-2e358ce975}
+VERSION=${VERSION:-0.4.7}
+VERSION_TAG=${VERSION_TAG:-ae26b25d43}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-ARCH=${ARCH:-$(uname -m)}
-case "$ARCH" in
-    i?86) ARCH=i686; LIBDIRSUFFIX="" ;;
-  x86_64) LIBDIRSUFFIX="64" ;;
-       *) echo "$ARCH is not supported"; exit 1 ;;
-esac
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+  ARCH=i686
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+  ARCH=i686
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+  ARCH=i686
+fi
+
 set -e
 
 rm -rf $PKG
@@ -58,8 +76,9 @@ find -L . \
 cp -r bin $PKG/usr/bin
 cp -r etc $PKG/usr/etc
 cp -r include $PKG/usr/include
-cp -r lib $PKG/usr/lib${LIBDIRSUFFIX}
-cp -r libexec $PKG/usr/libexec${LIBDIRSUFFIX}
+# The julia binary expects all its libs to be in lib, not lib${LIBDIRSUFFIX}
+cp -r lib $PKG/usr/lib
+cp -r libexec $PKG/usr/libexec
 cp -r share $PKG/usr/share
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
@@ -74,6 +93,8 @@ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a LICENSE.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 cat $CWD/$PRGNAM.info > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.info
+mv $PKG/usr/share/doc/julia/* $PKG/usr/doc/$PRGNAM-$VERSION
+rm -rf $PKG/usr/share/doc/
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc