From c645034b0165d03b97e3eddbbb0534f91e745c53 Mon Sep 17 00:00:00 2001 From: David Somero Date: Fri, 4 Jun 2010 01:10:32 -0400 Subject: libraries/unixODBC: Misc automated cleanups. Signed-off-by: David Somero --- libraries/unixODBC/unixODBC.SlackBuild | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'libraries/unixODBC') 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 -- cgit v1.2.3-65-gdbad