summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:07:08 -0400
committerDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:07:08 -0400
commit158e7086b23b49ea2004bc2714582dd55f155855 (patch)
tree716696185482fb3e42230a8f2e3ee92d30e62fca
parent1feeb25a81f1b35451520229908e0e884f28fb95 (diff)
downloadslackbuilds-158e7086b23b49ea2004bc2714582dd55f155855.tar.gz
libraries/haskell-regex-compat: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
-rw-r--r--libraries/haskell-regex-compat/haskell-regex-compat.SlackBuild14
1 files changed, 13 insertions, 1 deletions
diff --git a/libraries/haskell-regex-compat/haskell-regex-compat.SlackBuild b/libraries/haskell-regex-compat/haskell-regex-compat.SlackBuild
index fc7ea2d439..38f2d74305 100644
--- a/libraries/haskell-regex-compat/haskell-regex-compat.SlackBuild
+++ b/libraries/haskell-regex-compat/haskell-regex-compat.SlackBuild
@@ -7,13 +7,22 @@
PRGNAM=haskell-regex-compat
VERSION=${VERSION:-0.92}
-ARCH=${ARCH:-i486}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
TARNAM=regex-compat
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