summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author David Somero <xgizzmo@slackbuilds.org>2010-06-04 01:03:14 -0400
committer David Somero <xgizzmo@slackbuilds.org>2010-06-04 01:03:14 -0400
commit5e96a72f95010b555989976572b5a841c473db43 (patch)
tree9aa7dd5ecdc5bc7a2a7d103d8b6a6e319b475d53
parent48aa54b8d2d02f06063be0b350d72e169d11cd49 (diff)
downloadslackbuilds-5e96a72f95010b555989976572b5a841c473db43.tar.gz
slackbuilds-5e96a72f95010b555989976572b5a841c473db43.tar.xz
development/p4v: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
-rwxr-xr-xdevelopment/p4v/p4v.SlackBuild14
1 files changed, 13 insertions, 1 deletions
diff --git a/development/p4v/p4v.SlackBuild b/development/p4v/p4v.SlackBuild
index 2af33aa1fa..1ed9d2ad1b 100755
--- a/development/p4v/p4v.SlackBuild
+++ b/development/p4v/p4v.SlackBuild
@@ -25,10 +25,19 @@
# Modified by the SlackBuilds.org --michiel
PRGNAM=p4v
VERSION=${VERSION:-2009.2.236331}
-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) 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
@@ -43,6 +52,9 @@ elif [ "$ARCH" = "i686" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
set -e # Exit on most errors