diff options
| author | dsomero <xgizzmo@gmail.com> | 2010-05-23 18:31:31 -0400 |
|---|---|---|
| committer | David Somero <xgizzmo@slackbuilds.org> | 2010-05-23 23:30:18 -0500 |
| commit | 22d1eecf409f69a52ad73576a86a7ac363a525e2 (patch) | |
| tree | 515e842e68c42c02da85d75b2808d91d00e38997 | |
| parent | a53c59c4da94d3403500a9396a3391b0de673a47 (diff) | |
libraries/geos: Miscellaneous cleanups.
Cleaned up build and disabled broken ruby bindings.
| -rw-r--r-- | libraries/geos/geos.SlackBuild | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/libraries/geos/geos.SlackBuild b/libraries/geos/geos.SlackBuild index 1fbe50f79f5b2..857c7e28216e7 100644 --- a/libraries/geos/geos.SlackBuild +++ b/libraries/geos/geos.SlackBuild @@ -5,10 +5,20 @@ PRGNAM=geos VERSION=${VERSION:-3.0.4} -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-$VERSION @@ -23,6 +33,9 @@ elif [ "$ARCH" = "i686" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi set -e @@ -53,7 +66,7 @@ CXXFLAGS="$SLKCFLAGS" \ --enable-shared \ --disable-static \ --enable-python \ - --enable-ruby \ + --disable-ruby \ --build=$ARCH-slackware-linux make |