diff options
Diffstat (limited to 'source/l/zlib')
| -rwxr-xr-x | source/l/zlib/zlib.SlackBuild | 23 | ||||
| -rw-r--r-- | source/l/zlib/zlib.largefile64_source.diff | 11 |
2 files changed, 14 insertions, 20 deletions
diff --git a/source/l/zlib/zlib.SlackBuild b/source/l/zlib/zlib.SlackBuild index 9d5f928d..eb284280 100755 --- a/source/l/zlib/zlib.SlackBuild +++ b/source/l/zlib/zlib.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2005-2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2005-2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ PKGNAM=zlib VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-4} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -64,13 +64,6 @@ rm -rf zlib-$VERSION tar xvf $CWD/zlib-$VERSION.tar.?z* || exit 1 cd zlib-$VERSION || exit 1 -# Attempt to work around a problem that affects libxml2 on 64-bits -# and probably breaks other things as well. The issue stems from -# misuse of zlib by other libraries, but there's no other good place -# to put this fix. Note to self - keep an eye on upstream for a -# proper fix. -zcat $CWD/zlib.largefile64_source.diff.gz | patch -p1 --verbose || exit 1 - chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -104,6 +97,18 @@ cat zlib.3 | gzip -9c > $PKG/usr/man/man3/zlib.3.gz mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig cat zlib.pc > $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/zlib.pc +# Now that libkmod requires libz, we had better move the shared library +# up a level: +mkdir $PKG/lib${LIBDIRSUFFIX} +( cd $PKG/usr/lib${LIBDIRSUFFIX} + for file in lib*.so.?.* ; do + mv $file ../../lib${LIBDIRSUFFIX} + ln -sf ../../lib${LIBDIRSUFFIX}/$file . + done + cp -a lib*.so.? ../../lib${LIBDIRSUFFIX} +) + +# Strip binaries: ( cd $PKG find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null diff --git a/source/l/zlib/zlib.largefile64_source.diff b/source/l/zlib/zlib.largefile64_source.diff deleted file mode 100644 index 61d7b84d..00000000 --- a/source/l/zlib/zlib.largefile64_source.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- ./zlib.h.orig 2010-04-19 23:12:48.000000000 -0500 -+++ ./zlib.h 2011-02-09 12:12:15.000000000 -0600 -@@ -1578,7 +1578,7 @@ - # define gzoffset gzoffset64 - # define adler32_combine adler32_combine64 - # define crc32_combine crc32_combine64 --# ifdef _LARGEFILE64_SOURCE -+# ifndef _LARGEFILE64_SOURCE - ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *)); - ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int)); - ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile)); |