From 306d61b77efc418f009c6d3d60d1adf8c193ee95 Mon Sep 17 00:00:00 2001 From: David Somero Date: Fri, 4 Jun 2010 01:15:41 -0400 Subject: [PATCH] system/gconf-editor: Misc automated cleanups. Signed-off-by: David Somero --- system/gconf-editor/gconf-editor.SlackBuild | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/system/gconf-editor/gconf-editor.SlackBuild b/system/gconf-editor/gconf-editor.SlackBuild index 9d0c069a70..f41690bbe4 100644 --- a/system/gconf-editor/gconf-editor.SlackBuild +++ b/system/gconf-editor/gconf-editor.SlackBuild @@ -24,10 +24,19 @@ PRGNAM=gconf-editor VERSION=2.24.1 -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 @@ -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