summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:16:15 -0400
committerDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:16:15 -0400
commite450129f59c594641dc7ea614b5fefa621dc1a91 (patch)
tree642ea42bc65b95723345f525f8d869fc238afc38
parentb58871538d84faee289bf81c044ce5de85a28785 (diff)
downloadslackbuilds-e450129f59c594641dc7ea614b5fefa621dc1a91.tar.gz
system/nss-mysql: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
-rw-r--r--system/nss-mysql/nss-mysql.SlackBuild14
1 files changed, 13 insertions, 1 deletions
diff --git a/system/nss-mysql/nss-mysql.SlackBuild b/system/nss-mysql/nss-mysql.SlackBuild
index c2591b3c10..08bccc3972 100644
--- a/system/nss-mysql/nss-mysql.SlackBuild
+++ b/system/nss-mysql/nss-mysql.SlackBuild
@@ -11,10 +11,19 @@
PRGNAM=nss-mysql
VERSION=${VERSION:-1.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
@@ -29,6 +38,9 @@ elif [ "$ARCH" = "i686" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
set -e # Exit on most errors