summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:05:51 -0400
committerDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:05:51 -0400
commitb273825c130e11bc3930c807b93d0c4805e58abf (patch)
tree29b14974b3993d3a7991607bc132f338be6424ae
parentd226cef55191fa437f88a6447051b078feb9b400 (diff)
downloadslackbuilds-b273825c130e11bc3930c807b93d0c4805e58abf.tar.gz
libraries/FreeImage: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
-rw-r--r--libraries/FreeImage/FreeImage.SlackBuild14
1 files changed, 13 insertions, 1 deletions
diff --git a/libraries/FreeImage/FreeImage.SlackBuild b/libraries/FreeImage/FreeImage.SlackBuild
index b1789f338d..459d53faf4 100644
--- a/libraries/FreeImage/FreeImage.SlackBuild
+++ b/libraries/FreeImage/FreeImage.SlackBuild
@@ -8,10 +8,19 @@
PRGNAM=FreeImage
VERSION=3.12.0
-ARCH=${ARCH:-i486}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
+# 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
@@ -26,6 +35,9 @@ elif [ "$ARCH" = "i686" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
set -e