summaryrefslogtreecommitdiff
path: root/libraries/haskell-X11
diff options
context:
space:
mode:
authorDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:06:58 -0400
committerDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:06:58 -0400
commit6af495f7b62662f593bd174113cb06ad89502ac9 (patch)
treeb7a72123a2cf9ce0a3c949f2e127c4c397e870fe /libraries/haskell-X11
parente6dbb7398834844b09fd818d84048ff73ef03203 (diff)
downloadslackbuilds-6af495f7b62662f593bd174113cb06ad89502ac9.tar.gz
libraries/haskell-X11: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
Diffstat (limited to 'libraries/haskell-X11')
-rw-r--r--libraries/haskell-X11/haskell-X11.SlackBuild14
1 files changed, 13 insertions, 1 deletions
diff --git a/libraries/haskell-X11/haskell-X11.SlackBuild b/libraries/haskell-X11/haskell-X11.SlackBuild
index 6a09813e38..67ce25e686 100644
--- a/libraries/haskell-X11/haskell-X11.SlackBuild
+++ b/libraries/haskell-X11/haskell-X11.SlackBuild
@@ -7,13 +7,22 @@
PRGNAM=haskell-X11
VERSION=${VERSION:-1.5.0.0}
-ARCH=${ARCH:-i486}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
TARNAM=X11
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