diff options
| author | dsomero <xgizzmo@gmail.com> | 2010-05-23 19:15:25 -0400 |
|---|---|---|
| committer | David Somero <xgizzmo@slackbuilds.org> | 2010-05-23 23:30:41 -0500 |
| commit | 2d344bfb2f03d961804dcdf1c288b53742b8ba24 (patch) | |
| tree | bff2a6721aa266a1a2a82ec300db2c715d0d4fe8 | |
| parent | c774f894417321698b691129a64103e1ef090068 (diff) | |
| download | slackbuilds-2d344bfb2f03d961804dcdf1c288b53742b8ba24.tar.gz | |
academic/qgis: Miscellaneous cleanups.
| -rw-r--r-- | academic/qgis/qgis.SlackBuild | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/academic/qgis/qgis.SlackBuild b/academic/qgis/qgis.SlackBuild index 227a05c5f2..0a792ef5fd 100644 --- a/academic/qgis/qgis.SlackBuild +++ b/academic/qgis/qgis.SlackBuild @@ -6,10 +6,19 @@ PRGNAM=qgis VERSION=${VERSION:-1.4.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) 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 @@ -24,6 +33,9 @@ elif [ "$ARCH" = "i686" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi set -e |