summaryrefslogtreecommitdiff
path: root/system/oss
diff options
context:
space:
mode:
authorDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:16:22 -0400
committerDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:16:22 -0400
commit21fad33106f6ec437e76088760a161dc4e74bfdc (patch)
tree9893c634dea250acc60801c4931c4fb9803fea04 /system/oss
parent06be7c31157e6959fab1ca3e6600108b32af2cce (diff)
downloadslackbuilds-21fad33106f6ec437e76088760a161dc4e74bfdc.tar.gz
system/oss: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
Diffstat (limited to 'system/oss')
-rw-r--r--system/oss/oss.SlackBuild14
1 files changed, 13 insertions, 1 deletions
diff --git a/system/oss/oss.SlackBuild b/system/oss/oss.SlackBuild
index c4ffbcf840..87e8524b49 100644
--- a/system/oss/oss.SlackBuild
+++ b/system/oss/oss.SlackBuild
@@ -7,13 +7,22 @@
PRGNAM=oss
VERSION=${VERSION:-4.2}
SUBVERSION=${SUBVERSION:-2002}
-ARCH=${ARCH:-i486}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
SRCVERSION=v${VERSION}-build${SUBVERSION}-src-gpl
PKGVERSION=${VERSION}.${SUBVERSION}
+# 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
@@ -28,6 +37,9 @@ elif [ "$ARCH" = "i686" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2" # yes, -fPIC is left out on purpose here
LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
set -e # Exit on most errors