summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:06:56 -0400
committerDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:06:56 -0400
commitad953adf6c93c5cf2d39c8430b464b6373af93ad (patch)
tree2d5cb574f8de9851684e75df03ebff746c59c9bf
parent03b940e159d3e8aa9bf7429c8765dff7ad347f16 (diff)
downloadslackbuilds-ad953adf6c93c5cf2d39c8430b464b6373af93ad.tar.gz
libraries/haskell-HUnit: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
-rw-r--r--libraries/haskell-HUnit/haskell-HUnit.SlackBuild14
1 files changed, 13 insertions, 1 deletions
diff --git a/libraries/haskell-HUnit/haskell-HUnit.SlackBuild b/libraries/haskell-HUnit/haskell-HUnit.SlackBuild
index b72537b542..1a9dbe4d94 100644
--- a/libraries/haskell-HUnit/haskell-HUnit.SlackBuild
+++ b/libraries/haskell-HUnit/haskell-HUnit.SlackBuild
@@ -7,13 +7,22 @@
PRGNAM=haskell-HUnit
VERSION=${VERSION:-1.2.2.1}
-ARCH=${ARCH:-i486}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
TARNAM=HUnit
GHC_VERSION=$(ghc-pkg field ghc version | cut -d' ' -f2)
+# 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