diff options
| author |   Eric Hameleers <alien@slackware.com> | 2012-07-27 08:37:42 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2012-07-27 08:37:42 +0000 |
| commit | 5ee20f4375d90ab73be952c9bf2052dfc8a813fd (patch) | |
| tree | c77f9b28afb8bce71a01f5e05076273cf302bde8 | |
| parent | 841b7460f3ebb59bf604f609c5f08c5005c45f7a (diff) | |
| download | asb-5ee20f4375d90ab73be952c9bf2052dfc8a813fd.tar.gz asb-5ee20f4375d90ab73be952c9bf2052dfc8a813fd.tar.xz | |
Update to 2.3.4
| -rwxr-xr-x | python-lxml/build/python-lxml.SlackBuild | 35 |
1 files changed, 14 insertions, 21 deletions
diff --git a/python-lxml/build/python-lxml.SlackBuild b/python-lxml/build/python-lxml.SlackBuild index 24023399..ace7f167 100755 --- a/python-lxml/build/python-lxml.SlackBuild +++ b/python-lxml/build/python-lxml.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh # $Id$ -# Copyright 2010, 2011 Eric Hameleers, Eindhoven, NL +# Copyright 2010, 2011, 2012 Eric Hameleers, Eindhoven, NL # All rights reserved. # # Permission to use, copy, modify, and distribute this software for @@ -34,6 +34,8 @@ # * Initial build. # 2.3-1: 15/may/2011 by Eric Hameleers <alien@slackware.com> # * Update. +# 2.3.4-1: 27/jul/2012 by Eric Hameleers <alien@slackware.com> +# * Update. # # Run 'sh python-lxml.SlackBuild' to build a Slackware package. # The package (.tgz) and .txt file as well as build logs are created in /tmp . @@ -45,7 +47,7 @@ PRGNAM=python-lxml SRCNAM=lxml -VERSION=${VERSION:-2.3} +VERSION=${VERSION:-2.3.4} BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:" -j4 "} TAG=${TAG:-alien} @@ -68,27 +70,17 @@ SRCURL="http://codespeak.net/${SRCNAM}/${SRCNAM}-${VERSION}.tgz" ## # Automatically determine the architecture we're building on: +MARCH=$( uname -m ) if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) export ARCH=i486 ;; - arm*) export ARCH=arm ;; + case "$MARCH" in + i?86) export ARCH=i486 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$( uname -m ) ;; + *) export ARCH=$MARCH ;; esac fi -case "$ARCH" in - i486) SLKCFLAGS="-O2 -march=i486 -mtune=i686" - SLKLDFLAGS=""; LIBDIRSUFFIX="" - ;; - x86_64) SLKCFLAGS="-O2 -fPIC" - SLKLDFLAGS="-L/usr/lib64"; LIBDIRSUFFIX="64" - ;; - *) SLKCFLAGS="-O2" - SLKLDFLAGS=""; LIBDIRSUFFIX="" - ;; -esac - # Exit the script on errors: set -e trap 'echo "$0 FAILED at line ${LINENO}" | tee $OUTPUT/error-${PRGNAM}.log' ERR @@ -111,10 +103,11 @@ rm -rf $OUTPUT/{configure,make,install,error,makepkg}-$PRGNAM.log # Source file availability: if ! [ -f ${SOURCE} ]; then + echo "Source '$(basename ${SOURCE})' not available yet..." + # Check if the $SRCDIR is writable at all - if not, download to $OUTPUT + [ -w "$SRCDIR" ] || SOURCE="$OUTPUT/$(basename $SOURCE)" + if [ -f ${SOURCE} ]; then echo "Ah, found it!"; continue; fi if ! [ "x${SRCURL}" == "x" ]; then - # Check if the $SRCDIR is writable at all - if not, download to $OUTPUT - [ -w "$SRCDIR" ] || SOURCE="$OUTPUT/$(basename $SOURCE)" - echo "Source '$(basename ${SOURCE})' not available yet..." echo "Will download file to $(dirname $SOURCE)" wget -nv -T 20 -O "${SOURCE}" "${SRCURL}" || true if [ $? -ne 0 -o ! -s "${SOURCE}" ]; then |