summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 00:59:02 -0400
committerDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 00:59:02 -0400
commit8b6869e15eccd69328138918727b979cdc100fb2 (patch)
tree88df457c2a0c875016f4f1b7066f12e87cf227d2
parentebbe1d67b8f19942c90201a00ca41680b0e2c686 (diff)
downloadslackbuilds-8b6869e15eccd69328138918727b979cdc100fb2.tar.gz
academic/glpk: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
-rw-r--r--academic/glpk/glpk.SlackBuild14
1 files changed, 13 insertions, 1 deletions
diff --git a/academic/glpk/glpk.SlackBuild b/academic/glpk/glpk.SlackBuild
index 25947c4329..ed09ce9079 100644
--- a/academic/glpk/glpk.SlackBuild
+++ b/academic/glpk/glpk.SlackBuild
@@ -5,10 +5,19 @@
PRGNAM=glpk
VERSION=${VERSION:-4.40}
-ARCH=${ARCH:-i486}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+ case "$( uname -m )" in
+ i?86) ARCH=i486 ;;
+ arm*) ARCH=arm ;;
+ # Unless $ARCH is already set, use uname -m for all other archs:
+ *) ARCH=$( uname -m ) ;;
+ esac
+fi
+
CWD=$(pwd)
TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
@@ -23,6 +32,9 @@ elif [ "$ARCH" = "i686" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
set -e