From 3d26ebd3ffb78b70e5875cb18092cb0835c94b2a Mon Sep 17 00:00:00 2001
From: dsomero <xgizzmo@gmail.com>
Date: Thu, 27 May 2010 05:30:15 -0400
Subject: network/sqlninja: Miscellaneous cleanups.

---
 network/sqlninja/sqlninja.SlackBuild | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

(limited to 'network/sqlninja/sqlninja.SlackBuild')

diff --git a/network/sqlninja/sqlninja.SlackBuild b/network/sqlninja/sqlninja.SlackBuild
index a820628083..69ae4ccb30 100644
--- a/network/sqlninja/sqlninja.SlackBuild
+++ b/network/sqlninja/sqlninja.SlackBuild
@@ -24,11 +24,20 @@
 
 PRGNAM=sqlninja
 SRCVERSION=0.2.3-r1
-VERSION=${SRCVERSION}p
-ARCH=${ARCH:-i486}
+VERSION=$(echo ${SRCVERSION}p | tr - _)
 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
@@ -37,11 +46,17 @@ OUTPUT=${OUTPUT:-/tmp}
 DOCS="LICENSE README dnstun/ sqlninja-howto.html"
 
 if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 set -e
-- 
cgit v1.2.3