summaryrefslogtreecommitdiff
path: root/libraries
diff options
context:
space:
mode:
authorDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:08:50 -0400
committerDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:08:50 -0400
commit62242382618749824bd80b4a5a9e8b9afa9d6192 (patch)
treec316fa03712defbe041f358dc84835f98d027843 /libraries
parente7fc6260e9e6a98e4890529b65efe8db781b9752 (diff)
downloadslackbuilds-62242382618749824bd80b4a5a9e8b9afa9d6192.tar.gz
libraries/libssh: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
Diffstat (limited to 'libraries')
-rw-r--r--libraries/libssh/libssh.SlackBuild14
1 files changed, 13 insertions, 1 deletions
diff --git a/libraries/libssh/libssh.SlackBuild b/libraries/libssh/libssh.SlackBuild
index 15893583b5..0e28e701c3 100644
--- a/libraries/libssh/libssh.SlackBuild
+++ b/libraries/libssh/libssh.SlackBuild
@@ -6,10 +6,19 @@
PRGNAM=libssh
VERSION=${VERSION:-0.4.2}
-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
@@ -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