aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobby Workman <rworkman@slackbuilds.org>2010-05-23 00:43:31 -0500
committerRobby Workman <rworkman@slackbuilds.org>2010-05-23 23:21:43 -0500
commitccbd0f3fa6cb9291bf9db2d82984051913227622 (patch)
treeaea0ecf9c9e91901b658f4e02a1944d7cff45db9
parent4d896df4cb05a24a1858f8f7a27c8db292be4609 (diff)
desktop/slock: Miscellaneous cleanups
-rw-r--r--desktop/slock/slock.SlackBuild14
-rw-r--r--desktop/slock/slock.info2
2 files changed, 14 insertions, 2 deletions
diff --git a/desktop/slock/slock.SlackBuild b/desktop/slock/slock.SlackBuild
index 92d0e687d302b..c15cc90a6228f 100644
--- a/desktop/slock/slock.SlackBuild
+++ b/desktop/slock/slock.SlackBuild
@@ -7,10 +7,19 @@
PRGNAM=slock
VERSION=${VERSION:-0.9}
-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) export ARCH=i486 ;;
+ arm*) export ARCH=arm ;;
+ # Unless $ARCH is already set, use uname -m for all other archs:
+ *) export ARCH=$( uname -m ) ;;
+ esac
+fi
+
CWD=$(pwd)
TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
@@ -25,6 +34,9 @@ elif [ "$ARCH" = "i686" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
set -e
diff --git a/desktop/slock/slock.info b/desktop/slock/slock.info
index f7b28d5c4ad59..cfdb55aeaea8a 100644
--- a/desktop/slock/slock.info
+++ b/desktop/slock/slock.info
@@ -1,7 +1,7 @@
PRGNAM="slock"
VERSION="0.9"
HOMEPAGE="http://tools.suckless.org/slock"
-DOWNLOAD="http://code.suckless.org/dl/tools/slock-0.9.tar.gz"
+DOWNLOAD="http://dl.suckless.org/tools/slock-0.9.tar.gz"
MD5SUM="df342ad129cf2c3b8eb8da9d9d0ab845"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""