From 77cd31b03273c4ff5d7aeba15151453d7c2a8060 Mon Sep 17 00:00:00 2001 From: David Somero Date: Fri, 4 Jun 2010 01:16:49 -0400 Subject: [PATCH] system/sqlite2: Misc automated cleanups. Signed-off-by: David Somero --- system/sqlite2/sqlite2.SlackBuild | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) 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