summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:10:32 -0400
committerDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:10:32 -0400
commitc645034b0165d03b97e3eddbbb0534f91e745c53 (patch)
treea3bb22dafdf21778bf9fee9b67a215e7e78265c0
parentaa7d6aa5a07a240b65b7d4b613904e62e57f45e2 (diff)
downloadslackbuilds-c645034b0165d03b97e3eddbbb0534f91e745c53.tar.gz
libraries/unixODBC: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
-rw-r--r--libraries/unixODBC/unixODBC.SlackBuild14
1 files changed, 10 insertions, 4 deletions
diff --git a/libraries/unixODBC/unixODBC.SlackBuild b/libraries/unixODBC/unixODBC.SlackBuild
index 1190eb0f2d..c546664b5c 100644
--- a/libraries/unixODBC/unixODBC.SlackBuild
+++ b/libraries/unixODBC/unixODBC.SlackBuild
@@ -30,9 +30,18 @@
PRGNAM=unixODBC
VERSION=2.2.14
BUILD=${BUILD:-1}
-ARCH=${ARCH:-i486}
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
@@ -47,9 +56,6 @@ elif [ "$ARCH" = "i686" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
fi
set -e