summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libraries/gsl/gsl.SlackBuild21
-rw-r--r--libraries/gsl/gsl.info8
2 files changed, 19 insertions, 10 deletions
diff --git a/libraries/gsl/gsl.SlackBuild b/libraries/gsl/gsl.SlackBuild
index e0779001cf..482cb59489 100644
--- a/libraries/gsl/gsl.SlackBuild
+++ b/libraries/gsl/gsl.SlackBuild
@@ -5,11 +5,20 @@
# Written by Aleksandar Samardzic <asamardzic@gmail.com>
PRGNAM=gsl
-VERSION=${VERSION:-1.13}
-ARCH=${ARCH:-i486}
+VERSION=${VERSION:-1.14}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+ case "$( uname -m )" in
+ i?86) export ARCH=i486 ;;
+ arm*) export ARCH=arm ;;
+ # Unless $ARCH is already set, use uname -m for all other archs:
+ *) export ARCH=$( uname -m ) ;;
+ esac
+fi
+
CWD=$(pwd)
TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
@@ -24,6 +33,9 @@ elif [ "$ARCH" = "i686" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
set -e
@@ -58,10 +70,7 @@ make install DESTDIR=$PKG
find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-( cd $PKG/usr/man
- find . -type f -exec gzip -9 {} \;
- for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
+find $PKG/usr/man -type f -exec gzip -9 {} \;
mv $PKG/usr/share/info $PKG/usr
rm -f $PKG/usr/info/dir
diff --git a/libraries/gsl/gsl.info b/libraries/gsl/gsl.info
index 9a984022d6..2fd355544a 100644
--- a/libraries/gsl/gsl.info
+++ b/libraries/gsl/gsl.info
@@ -1,10 +1,10 @@
PRGNAM="gsl"
-VERSION="1.13"
+VERSION="1.14"
HOMEPAGE="http://www.gnu.org/software/gsl"
-DOWNLOAD="ftp://ftp.gnu.org/gnu/gsl/gsl-1.13.tar.gz"
-MD5SUM="d9fcfa367c44ab68a25b4edf34c3c5f7"
+DOWNLOAD="ftp://ftp.gnu.org/gnu/gsl/gsl-1.14.tar.gz"
+MD5SUM="d55e7b141815412a072a3f0e12442042"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
MAINTAINER="Aleksandar Samardzic"
EMAIL="asamardzic@gmail.com"
-APPROVED="dsomero"
+APPROVED="rworkman"