summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobby Workman <rworkman@slackbuilds.org>2010-05-21 10:39:02 -0500
committerRobby Workman <rworkman@slackbuilds.org>2010-05-23 23:21:39 -0500
commit3f233ac396a9612f14582641147a09229306dc19 (patch)
treebd58155e57ebf60efb53404623f16c3fdee22af2
parent9d90d7e5f6e01ef7e85aff0f7c68fccbcd9863e7 (diff)
downloadslackbuilds-3f233ac396a9612f14582641147a09229306dc19.tar.gz
libraries/libast: Miscellaneous cleanups.
-rw-r--r--libraries/libast/README9
-rw-r--r--libraries/libast/libast.SlackBuild16
-rw-r--r--libraries/libast/slack-desc6
3 files changed, 21 insertions, 10 deletions
diff --git a/libraries/libast/README b/libraries/libast/README
index 40675b79d9..1ea3316101 100644
--- a/libraries/libast/README
+++ b/libraries/libast/README
@@ -1,5 +1,4 @@
-LibAST is the Library of Assorted Spiffy Things. It contains
-various handy routines and drop-in substitutes for some good
-but non-portable functions. It currently has a built-in memory
-tracking subsystem as well as some debugging aids and other
-similar tools.
+LibAST is the Library of Assorted Spiffy Things. It contains various handy
+routines and drop-in substitutes for some good but non-portable functions.
+It currently has a built-in memory tracking subsystem as well as some
+debugging aids and other similar tools.
diff --git a/libraries/libast/libast.SlackBuild b/libraries/libast/libast.SlackBuild
index 28e1cee632..0f62051bd3 100644
--- a/libraries/libast/libast.SlackBuild
+++ b/libraries/libast/libast.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for libast
-# Copyright 2008-2009 Robby Workman Northport, Alabama (USA)
+# Copyright 2008,2009,2010 Robby Workman, Northport, Alabama (USA)
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -24,10 +24,19 @@
PRGNAM=libast
VERSION=0.7
-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
@@ -42,6 +51,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/libraries/libast/slack-desc b/libraries/libast/slack-desc
index ad57e6e37f..b15966de2d 100644
--- a/libraries/libast/slack-desc
+++ b/libraries/libast/slack-desc
@@ -14,6 +14,6 @@ libast: but non-portable functions. It currently has a built-in memory
libast: tracking subsystem as well as some debugging aids and other
libast: similar tools.
libast:
-libast:
-libast:
-libast:
+libast:
+libast:
+libast: