summaryrefslogtreecommitdiffstats
path: root/libraries/haskell-X11-xft
diff options
context:
space:
mode:
author David Somero <xgizzmo@slackbuilds.org>2010-06-04 01:06:57 -0400
committer David Somero <xgizzmo@slackbuilds.org>2010-06-04 01:06:57 -0400
commite6dbb7398834844b09fd818d84048ff73ef03203 (patch)
treefda68addd21cd6fc2af3637ae2aad46518ef4e8a /libraries/haskell-X11-xft
parentaa05b99dc399445b7d1328deae23bf9090790be8 (diff)
downloadslackbuilds-e6dbb7398834844b09fd818d84048ff73ef03203.tar.gz
slackbuilds-e6dbb7398834844b09fd818d84048ff73ef03203.tar.xz
libraries/haskell-X11-xft: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
Diffstat (limited to 'libraries/haskell-X11-xft')
-rw-r--r--libraries/haskell-X11-xft/haskell-X11-xft.SlackBuild14
1 files changed, 13 insertions, 1 deletions
diff --git a/libraries/haskell-X11-xft/haskell-X11-xft.SlackBuild b/libraries/haskell-X11-xft/haskell-X11-xft.SlackBuild
index c6ae7b86e3..601cd667dd 100644
--- a/libraries/haskell-X11-xft/haskell-X11-xft.SlackBuild
+++ b/libraries/haskell-X11-xft/haskell-X11-xft.SlackBuild
@@ -7,13 +7,22 @@
PRGNAM=haskell-X11-xft
VERSION=${VERSION:-0.3}
-ARCH=${ARCH:-i486}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
TARNAM=X11-xft
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