summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:07:01 -0400
committerDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:07:01 -0400
commitf332f38a90b7d5fa7f6a980c1456f72c83a2b5f0 (patch)
treed8cbb65638f8f0f9218df47ac78a61d0d53d11d3
parent17fa921b20c33fbc81aca8a9d18db9e2992ca20f (diff)
downloadslackbuilds-f332f38a90b7d5fa7f6a980c1456f72c83a2b5f0.tar.gz
libraries/haskell-fgl: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
-rw-r--r--libraries/haskell-fgl/haskell-fgl.SlackBuild14
1 files changed, 13 insertions, 1 deletions
diff --git a/libraries/haskell-fgl/haskell-fgl.SlackBuild b/libraries/haskell-fgl/haskell-fgl.SlackBuild
index d1f81bb2a8..af369ce046 100644
--- a/libraries/haskell-fgl/haskell-fgl.SlackBuild
+++ b/libraries/haskell-fgl/haskell-fgl.SlackBuild
@@ -7,13 +7,22 @@
PRGNAM=haskell-fgl
VERSION=${VERSION:-5.4.2.2}
-ARCH=${ARCH:-i486}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
TARNAM=fgl
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