summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Robby Workman <rworkman@slackbuilds.org>2010-05-23 16:43:35 -0500
committer Robby Workman <rworkman@slackbuilds.org>2010-05-23 23:21:46 -0500
commit684c3c2a7d807a2000145afab16cd70baca4b851 (patch)
tree0c11843d5ae380a637938552bcbfa65e654d0ec0
parent1db8cf1729f493d065701b15b53e08b93e7fdfaa (diff)
downloadslackbuilds-684c3c2a7d807a2000145afab16cd70baca4b851.tar.gz
slackbuilds-684c3c2a7d807a2000145afab16cd70baca4b851.tar.xz
libraries/libsoup: Miscellaneous cleanups.
-rw-r--r--libraries/libsoup/libsoup.SlackBuild14
1 files changed, 13 insertions, 1 deletions
diff --git a/libraries/libsoup/libsoup.SlackBuild b/libraries/libsoup/libsoup.SlackBuild
index ec97a6a3f1..06f639e131 100644
--- a/libraries/libsoup/libsoup.SlackBuild
+++ b/libraries/libsoup/libsoup.SlackBuild
@@ -24,10 +24,19 @@
PRGNAM=libsoup
VERSION=2.26.3
-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 -eu