summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordsomero <xgizzmo@gmail.com>2010-05-23 18:51:24 -0400
committerDavid Somero <xgizzmo@slackbuilds.org>2010-05-23 23:30:34 -0500
commitc774f894417321698b691129a64103e1ef090068 (patch)
tree7127f28f266573cf2c2474e8067fa9cfd64e323c
parentc3ff4c4dbaf1d061b1d479ad6d7d85ac16dfb0d5 (diff)
downloadslackbuilds-c774f894417321698b691129a64103e1ef090068.tar.gz
libraries/gdal: Miscellaneous cleanups.
-rw-r--r--libraries/gdal/gdal.SlackBuild15
1 files changed, 14 insertions, 1 deletions
diff --git a/libraries/gdal/gdal.SlackBuild b/libraries/gdal/gdal.SlackBuild
index 1dff01b30f..d95f7b2f0f 100644
--- a/libraries/gdal/gdal.SlackBuild
+++ b/libraries/gdal/gdal.SlackBuild
@@ -4,10 +4,19 @@
PRGNAM=gdal
VERSION=1.6.3
-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) export ARCH=i486 ;;
+ arm*) export ARCH=arm ;;
+ # Unless $ARCH is already set, use uname -m for all other archs:
+ *) export ARCH=$( uname -m ) ;;
+ esac
+fi
+
CWD=$(pwd)
TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
@@ -22,8 +31,12 @@ elif [ "$ARCH" = "i686" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
+
set -e
rm -rf $PKG