aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:11:15 -0400
committerDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:11:15 -0400
commitfd65c89382db30d543de115738754f01f5ed7008 (patch)
tree1e7793dfdf85aee544bb1f482f0c4d74224aaa60
parent4b2ff9589ac17f7106d1617d1fdba24422991593 (diff)
misc/protobuf: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
-rw-r--r--misc/protobuf/protobuf.SlackBuild14
1 files changed, 13 insertions, 1 deletions
diff --git a/misc/protobuf/protobuf.SlackBuild b/misc/protobuf/protobuf.SlackBuild
index be94d708977e..cd36e4a2027e 100644
--- a/misc/protobuf/protobuf.SlackBuild
+++ b/misc/protobuf/protobuf.SlackBuild
@@ -6,10 +6,19 @@
PRGNAM=protobuf
VERSION=${VERSION:-2.3.0}
-ARCH=${ARCH:-i486}
BUILD=${BUILD:-2}
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
@@ -24,6 +33,9 @@ elif [ "$ARCH" = "i686" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
set -e