aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:10:30 -0400
committerDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:10:30 -0400
commitcd2f2b2e20d3166bf6a1b1c4a43ffbca6988cab0 (patch)
tree6099c293694bc2ee3138fb1f2e8b7bb8e1d72e12
parent7f901cffd89dd52b1575b259d64ab22e8b1ccd63 (diff)
libraries/tinyxml: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
-rw-r--r--libraries/tinyxml/tinyxml.SlackBuild14
1 files changed, 13 insertions, 1 deletions
diff --git a/libraries/tinyxml/tinyxml.SlackBuild b/libraries/tinyxml/tinyxml.SlackBuild
index 97709305fc005..cdc5f1c06494b 100644
--- a/libraries/tinyxml/tinyxml.SlackBuild
+++ b/libraries/tinyxml/tinyxml.SlackBuild
@@ -6,10 +6,19 @@
PRGNAM=tinyxml
VERSION=${VERSION:-2.5.3}
-ARCH=${ARCH:-i486}
BUILD=${BUILD:-2}
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