diff options
| author |   David Somero <xgizzmo@slackbuilds.org> | 2010-06-04 01:15:36 -0400 |
|---|---|---|
| committer | David Somero <xgizzmo@slackbuilds.org> | 2010-06-04 01:15:36 -0400 |
| commit | 27c1357eb3640be90fd81136ada86e7f02c27f52 (patch) | |
| tree | 294b3943c07e08d2f971129659eb6a35ab60a5a1 /system/fish | |
| parent | dbf6ed95685448b391e331d3df776bf6ac5de18f (diff) | |
| download | slackbuilds-27c1357eb3640be90fd81136ada86e7f02c27f52.tar.gz slackbuilds-27c1357eb3640be90fd81136ada86e7f02c27f52.tar.xz | |
system/fish: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
Diffstat (limited to 'system/fish')
| -rw-r--r-- | system/fish/fish.SlackBuild | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/system/fish/fish.SlackBuild b/system/fish/fish.SlackBuild index ff60e7b4d9..6fffe813f9 100644 --- a/system/fish/fish.SlackBuild +++ b/system/fish/fish.SlackBuild @@ -27,10 +27,19 @@ PRGNAM=fish VERSION=1.23.1 -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 @@ -45,6 +54,9 @@ elif [ "$ARCH" = "i686" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi set -e |