summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:11:10 -0400
committerDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:11:10 -0400
commit21119d463153d0d453b492ee751e8f0b770e0ad4 (patch)
treee64ee8c69e2e704627cc02e4b3a78a880759c5c8
parentd7411e1ebd59a3bfff29096241fa933d6a028213 (diff)
downloadslackbuilds-21119d463153d0d453b492ee751e8f0b770e0ad4.tar.gz
misc/misctools: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
-rw-r--r--misc/misctools/misctools.SlackBuild14
1 files changed, 13 insertions, 1 deletions
diff --git a/misc/misctools/misctools.SlackBuild b/misc/misctools/misctools.SlackBuild
index 5cd16775e4..5a38b82d6b 100644
--- a/misc/misctools/misctools.SlackBuild
+++ b/misc/misctools/misctools.SlackBuild
@@ -10,10 +10,19 @@
PRGNAM=misctools
VERSION=${VERSION:-2.5.5}
-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
@@ -28,6 +37,9 @@ elif [ "$ARCH" = "i686" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
set -e # Exit on most errors