diff options
| author | David Somero <xgizzmo@slackbuilds.org> | 2010-06-04 01:02:38 -0400 |
|---|---|---|
| committer | David Somero <xgizzmo@slackbuilds.org> | 2010-06-04 01:02:38 -0400 |
| commit | 1be5d3e4371d8b9ea7bbfc8e32cb8afbbeaa18bb (patch) | |
| tree | 843786a319c98f810d1a9f4bcc64caa80d1362f8 | |
| parent | 20f74241f2e2bcee9b4f6a16f66e864151aa1146 (diff) | |
development/couchdb: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
| -rw-r--r-- | development/couchdb/couchdb.SlackBuild | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/development/couchdb/couchdb.SlackBuild b/development/couchdb/couchdb.SlackBuild index 3ac6afed173f..54e70c794714 100644 --- a/development/couchdb/couchdb.SlackBuild +++ b/development/couchdb/couchdb.SlackBuild @@ -7,12 +7,21 @@ PRGNAM=couchdb VERSION=0.11.0 -ARCH=${ARCH:-i486} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGSRC=apache-couchdb +# 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 @@ -44,6 +53,9 @@ elif [ "$ARCH" = "i686" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi set -e |