diff options
| author | David Somero <xgizzmo@slackbuilds.org> | 2010-06-04 01:06:46 -0400 |
|---|---|---|
| committer | David Somero <xgizzmo@slackbuilds.org> | 2010-06-04 01:06:46 -0400 |
| commit | 29fa34501971aef68ad48f1f42f1bc79d8a43d26 (patch) | |
| tree | 8e40226e30c5eb9920dc2749ed2c2f1dc7cffe78 | |
| parent | 2376dd0c619277b306d0986114c346cd0e081b08 (diff) | |
| download | slackbuilds-29fa34501971aef68ad48f1f42f1bc79d8a43d26.tar.gz | |
libraries/goffice: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
| -rw-r--r-- | libraries/goffice/goffice.SlackBuild | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/libraries/goffice/goffice.SlackBuild b/libraries/goffice/goffice.SlackBuild index 7e0df50ca3..6248a65e29 100644 --- a/libraries/goffice/goffice.SlackBuild +++ b/libraries/goffice/goffice.SlackBuild @@ -26,10 +26,19 @@ PRGNAM=goffice VERSION=${VERSION:-0.7.0} -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 @@ -44,6 +53,9 @@ elif [ "$ARCH" = "i686" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi set -e |