summaryrefslogtreecommitdiff
path: root/libraries
diff options
context:
space:
mode:
authorRobby Workman <rworkman@slackbuilds.org>2010-05-23 02:55:38 -0500
committerRobby Workman <rworkman@slackbuilds.org>2010-05-23 23:21:45 -0500
commit029dd1c3d0ffe75ca5630029ccd752548424dbaf (patch)
treeb009b9638912a2d02c82c236ac84c398e6b51ba4 /libraries
parente5a2b394392db3db094f541de2ee93c14d490b42 (diff)
downloadslackbuilds-029dd1c3d0ffe75ca5630029ccd752548424dbaf.tar.gz
libraries/libnetfilter_conntrack: Miscellaneous cleanups
Diffstat (limited to 'libraries')
-rw-r--r--libraries/libnetfilter_conntrack/libnetfilter_conntrack.SlackBuild16
1 files changed, 14 insertions, 2 deletions
diff --git a/libraries/libnetfilter_conntrack/libnetfilter_conntrack.SlackBuild b/libraries/libnetfilter_conntrack/libnetfilter_conntrack.SlackBuild
index d4ab8122d0..d6b2766521 100644
--- a/libraries/libnetfilter_conntrack/libnetfilter_conntrack.SlackBuild
+++ b/libraries/libnetfilter_conntrack/libnetfilter_conntrack.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for libnetfilter_conntrack
-# Copyright 2006-2008 Robby Workman, Northport, Alabama, USA
+# Copyright 2006,2007,2008,2010 Robby Workman, Northport, Alabama, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -24,10 +24,19 @@
PRGNAM=libnetfilter_conntrack
VERSION=0.0.101
-ARCH=${ARCH:-i486}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+ case "$( uname -m )" in
+ i?86) export ARCH=i486 ;;
+ arm*) export ARCH=arm ;;
+ # Unless $ARCH is already set, use uname -m for all other archs:
+ *) export ARCH=$( uname -m ) ;;
+ esac
+fi
+
CWD=$(pwd)
TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
@@ -42,6 +51,9 @@ elif [ "$ARCH" = "i686" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
set -e