summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:16:49 -0400
committerDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:16:49 -0400
commit77cd31b03273c4ff5d7aeba15151453d7c2a8060 (patch)
treee5e1a773b66dcf85d6a6d13d58769f9f2e6fce35
parentb5ad1c98c3a1143851faf03c11232e672ca6df88 (diff)
downloadslackbuilds-77cd31b03273c4ff5d7aeba15151453d7c2a8060.tar.gz
system/sqlite2: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
-rwxr-xr-xsystem/sqlite2/sqlite2.SlackBuild14
1 files changed, 13 insertions, 1 deletions
diff --git a/system/sqlite2/sqlite2.SlackBuild b/system/sqlite2/sqlite2.SlackBuild
index 5f9dc83b64..7b53f21ca0 100755
--- a/system/sqlite2/sqlite2.SlackBuild
+++ b/system/sqlite2/sqlite2.SlackBuild
@@ -9,7 +9,6 @@
PRGNAM=sqlite2
VERSION=${VERSION:-2.8.17_6}
-ARCH=${ARCH:-i486}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -17,6 +16,16 @@ SRCNAM=sqlite
SRCVERSION=$(printf "$VERSION" | cut -d _ -f 1)
PATCHLEVEL=$(printf "$VERSION" | cut -d _ -f 2)
+# 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
@@ -31,6 +40,9 @@ elif [ "$ARCH" = "i686" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
set -e