summaryrefslogtreecommitdiffstats
path: root/academic
diff options
context:
space:
mode:
author David Somero2010-06-04 06:58:53 +0200
committer David Somero2010-06-04 06:58:53 +0200
commitb9fe35c80bffb129553ad910fe8c6571471c9789 (patch)
treeaa82ffadf84b99003ef029792c0fbf759bbf8b73 /academic
parent141aa2d1a56ae71cd0fbeb8c6ae7a79cd80568f3 (diff)
downloadslackbuilds-b9fe35c80bffb129553ad910fe8c6571471c9789.tar.gz
academic/calc: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
Diffstat (limited to 'academic')
-rw-r--r--academic/calc/calc.SlackBuild14
1 files changed, 13 insertions, 1 deletions
diff --git a/academic/calc/calc.SlackBuild b/academic/calc/calc.SlackBuild
index 016ec5e261..9abf330b54 100644
--- a/academic/calc/calc.SlackBuild
+++ b/academic/calc/calc.SlackBuild
@@ -7,10 +7,19 @@
PRGNAM=calc
VERSION=${VERSION:-2.12.4.0}
-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
@@ -25,6 +34,9 @@ elif [ "$ARCH" = "i686" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
set -e