summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobby Workman <rworkman@slackbuilds.org>2010-05-23 03:12:38 -0500
committerRobby Workman <rworkman@slackbuilds.org>2010-05-23 23:21:45 -0500
commit91f0e267baa88ddde7313f0f84a82c71b886ddea (patch)
treeb992196cbef61b3a5c6e5b529b5af628034b2a7d
parent47dd33fc0ea106d67b05554f3529ac8402d290c1 (diff)
downloadslackbuilds-91f0e267baa88ddde7313f0f84a82c71b886ddea.tar.gz
libraries/lxml: Miscellaneous cleanups.
-rw-r--r--libraries/lxml/lxml.SlackBuild14
1 files changed, 12 insertions, 2 deletions
diff --git a/libraries/lxml/lxml.SlackBuild b/libraries/lxml/lxml.SlackBuild
index 8e5eedd62a..d92042034d 100644
--- a/libraries/lxml/lxml.SlackBuild
+++ b/libraries/lxml/lxml.SlackBuild
@@ -4,10 +4,19 @@
PRGNAM=lxml
VERSION=${VERSION:-2.2.6}
-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
@@ -19,6 +28,8 @@ elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
+else
+ SLKCFLAGS="-O2"
fi
set -e
@@ -36,7 +47,6 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
-CFLAGS="$SLKCFLAGS" \
python setup.py install --root=$PKG
find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \