diff options
author | Eric Hameleers <alien@slackware.com> | 2012-08-07 20:48:54 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2012-08-07 20:48:54 +0000 |
commit | 5b3cee291edb4ebeed09aec02c63ab553b83e49b (patch) | |
tree | eb0d90774a36f8657ad549178c51c79038d955ef /pangomm/build | |
parent | 2e99175d6577749104c1c0fe5285873ec8328346 (diff) | |
download | asb-5b3cee291edb4ebeed09aec02c63ab553b83e49b.tar.gz asb-5b3cee291edb4ebeed09aec02c63ab553b83e49b.tar.xz |
Update to 2.28.4 for Slackware 14
Diffstat (limited to 'pangomm/build')
-rwxr-xr-x | pangomm/build/pangomm.SlackBuild | 43 |
1 files changed, 32 insertions, 11 deletions
diff --git a/pangomm/build/pangomm.SlackBuild b/pangomm/build/pangomm.SlackBuild index bd16c2d8..f656add0 100755 --- a/pangomm/build/pangomm.SlackBuild +++ b/pangomm/build/pangomm.SlackBuild @@ -34,6 +34,8 @@ # * Initial build. # 2.28.2-1: 07/aug/2011 by Eric Hameleers <alien@slackware.com> # * Update for Slackware 13.37. +# 2.28.4-1: 07/aug/2011 by Eric Hameleers <alien@slackware.com> +# * Update for Slackware 14. # # Run 'sh pangomm.SlackBuild' to build a Slackware package. # The package (.tgz) and .txt file as well as build logs are created in /tmp . @@ -44,7 +46,7 @@ # Set initial variables: PRGNAM=pangomm -VERSION=${VERSION:-2.28.2} +VERSION=${VERSION:-2.28.4} MAJVER=$(echo $VERSION | cut -d. -f1-2) BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:" -j4 "} @@ -60,20 +62,24 @@ TMP=${TMP:-/tmp/build} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -SOURCE="$SRCDIR/${PRGNAM}-${VERSION}.tar.bz2" -SRCURL="http://ftp.gnome.org/pub/GNOME/sources/${PRGNAM}/${MAJVER}/${PRGNAM}-${VERSION}.tar.bz2" +SOURCE="$SRCDIR/${PRGNAM}-${VERSION}.tar.xz" +SRCURL="http://ftp.gnome.org/pub/GNOME/sources/${PRGNAM}/${MAJVER}/${PRGNAM}-${VERSION}.tar.xz" ## ## --- with a little luck, you won't have to edit below this point --- ## ## # 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 ;; + armv6hl) export ARCH=$MARCH ;; + armv5hl) 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 @@ -84,11 +90,25 @@ case "$ARCH" in x86_64) SLKCFLAGS="-O2 -fPIC" SLKLDFLAGS="-L/usr/lib64"; LIBDIRSUFFIX="64" ;; + armv7hl) SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" + SLKLDFLAGS=""; LIBDIRSUFFIX="" + ;; + armv6hl) SLKCFLAGS="-O2 -march=armv6 -mfpu=vfp -mfloat-abi=hard" + SLKLDFLAGS=""; LIBDIRSUFFIX="" + ;; + armv5hl) SLKCFLAGS="-O2 -mthumb -march=armv5te -mtune=arm1176jzf-s -mfpu=vfp -mfloat-abi=softfp" + SLKLDFLAGS=""; LIBDIRSUFFIX="" + ;; *) SLKCFLAGS="-O2" SLKLDFLAGS=""; LIBDIRSUFFIX="" ;; esac +case "ARCH" in + arm*) TARGET=$ARCH-slackware-linux-gnueabi ;; + *) TARGET=$ARCH-slackware-linux ;; +esac + # Exit the script on errors: set -e trap 'echo "$0 FAILED at line ${LINENO}" | tee $OUTPUT/error-${PRGNAM}.log' ERR @@ -111,10 +131,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 @@ -161,7 +182,7 @@ CFLAGS="$SLKCFLAGS" \ --program-suffix= \ --disable-static \ --disable-documentation \ - --build=$ARCH-slackware-linux \ + --build=$TARGET \ 2>&1 | tee $OUTPUT/configure-${PRGNAM}.log make $NUMJOBS 2>&1 | tee $OUTPUT/make-${PRGNAM}.log |