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