summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:08:51 -0400
committerDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:08:51 -0400
commit88f0f59e8cb8dab3b8bfb1621c2c924e8072116c (patch)
tree5162b044096b9136d73a9b1b3802d0140a7eb4a6
parent62242382618749824bd80b4a5a9e8b9afa9d6192 (diff)
downloadslackbuilds-88f0f59e8cb8dab3b8bfb1621c2c924e8072116c.tar.gz
libraries/libssh2: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
-rw-r--r--libraries/libssh2/libssh2.SlackBuild14
1 files changed, 13 insertions, 1 deletions
diff --git a/libraries/libssh2/libssh2.SlackBuild b/libraries/libssh2/libssh2.SlackBuild
index ee41625243..98e6b06be1 100644
--- a/libraries/libssh2/libssh2.SlackBuild
+++ b/libraries/libssh2/libssh2.SlackBuild
@@ -10,10 +10,19 @@
PRGNAM=libssh2
VERSION=${VERSION:-1.2.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
@@ -28,6 +37,9 @@ elif [ "$ARCH" = "i686" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
set -e # Exit on most errors