summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author David Somero2010-06-04 07:07:11 +0200
committer David Somero2010-06-04 07:07:11 +0200
commit59b586f23c138d34ce628ca40054f93b9e8f3bff (patch)
treeeefe73ce53b145e05a64716fc79f3f3ab37dba26
parent93e3f4a8f57baa36ea96a2b1deed87a1603d2ad9 (diff)
downloadslackbuilds-59b586f23c138d34ce628ca40054f93b9e8f3bff.tar.gz
libraries/haskell-xhtml: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
-rw-r--r--libraries/haskell-xhtml/haskell-xhtml.SlackBuild14
1 files changed, 13 insertions, 1 deletions
diff --git a/libraries/haskell-xhtml/haskell-xhtml.SlackBuild b/libraries/haskell-xhtml/haskell-xhtml.SlackBuild
index b4aa420043..30f586279d 100644
--- a/libraries/haskell-xhtml/haskell-xhtml.SlackBuild
+++ b/libraries/haskell-xhtml/haskell-xhtml.SlackBuild
@@ -7,13 +7,22 @@
PRGNAM=haskell-xhtml
VERSION=${VERSION:-3000.2.0.1}
-ARCH=${ARCH:-i486}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
TARNAM=xhtml
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