diff options
Diffstat (limited to 'source/l/gd/gd.SlackBuild')
-rwxr-xr-x | source/l/gd/gd.SlackBuild | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/source/l/gd/gd.SlackBuild b/source/l/gd/gd.SlackBuild index c33f20ba..f998436a 100755 --- a/source/l/gd/gd.SlackBuild +++ b/source/l/gd/gd.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2006, 2007, 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2006, 2007, 2008, 2009, 2010, 2016 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,13 +22,13 @@ PKGNAM=gd -VERSION=${VERSION:-2.0.35} -BUILD=${BUILD:-4} +VERSION=${VERSION:-$(echo libgd-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i486 ;; + i?86) export ARCH=i586 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; @@ -44,8 +44,8 @@ PKG=$TMP/package-${PKGNAM} rm -rf $PKG mkdir -p $TMP $PKG -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "s390" ]; then SLKCFLAGS="-O2" @@ -59,11 +59,9 @@ else fi cd $TMP -rm -rf ${PKGNAM}-${VERSION} -tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1 -cd ${PKGNAM}-$VERSION - -zcat $CWD/gd.png14.diff.gz | patch -p1 --verbose || exit 1 +rm -rf libgd-${VERSION} +tar xvf $CWD/libgd-$VERSION.tar.xz || exit 1 +cd libgd-$VERSION || exit 1 # Make sure ownerships and permissions are sane: chown -R root:root . @@ -73,11 +71,7 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# Add pkgconfig file: -mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig -cat $CWD/gdlib.pc | sed -e "s/@VERSION@/$VERSION/" \ - | sed -e "s#/lib#/lib${LIBDIRSUFFIX}#g" \ - > $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/gdlib.pc +./bootstrap.sh # Configure: CFLAGS="$SLKCFLAGS" \ |