diff options
| author |   dsomero | 2010-05-27 11:30:15 +0200 |
|---|---|---|
| committer |   David Somero | 2010-05-27 12:10:05 +0200 |
| commit | 3d26ebd3ffb78b70e5875cb18092cb0835c94b2a (patch) | |
| tree | 6e86ef5c0f789a84ec1af0b9221f326da8a98f2a | |
| parent | 28e060948ce89367f9349409bf83c1f05078a6d3 (diff) | |
| download | slackbuilds-13.1-20100527.2.tar.gz | |
network/sqlninja: Miscellaneous cleanups.13.1-20100527.2
| -rw-r--r-- | network/sqlninja/sqlninja.SlackBuild | 19 |
1 files changed, 17 insertions, 2 deletions
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 |