From: Victor Martinez Date: Tue, 20 Nov 2012 16:31:35 +0000 (+0000) Subject: zlib: update to 1.2.7 X-Git-Url: http://gitweb/?a=commitdiff_plain;h=0132219921a442e1e8a078d62f1e764d4a078e38;p=crossrootfs.git zlib: update to 1.2.7 --- diff --git a/zlib/.footprint b/zlib/.footprint index f7f7ba2..4538e1a 100644 --- a/zlib/.footprint +++ b/zlib/.footprint @@ -1,12 +1,13 @@ +drwxr-xr-x root/root lib/ +lrwxrwxrwx root/root lib/libz.so.1 -> libz.so.1.2.7 +-rwxr-xr-x root/root lib/libz.so.1.2.7 drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/include/ -rw-r--r-- root/root usr/include/zconf.h -rw-r--r-- root/root usr/include/zlib.h drwxr-xr-x root/root usr/lib/ -rw-r--r-- root/root usr/lib/libz.a -lrwxrwxrwx root/root usr/lib/libz.so -> libz.so.1.2.5 -lrwxrwxrwx root/root usr/lib/libz.so.1 -> libz.so.1.2.5 --rwxr-xr-x root/root usr/lib/libz.so.1.2.5 +lrwxrwxrwx root/root usr/lib/libz.so -> ../../lib/libz.so.1.2.7 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/zlib.pc drwxr-xr-x root/root usr/man/ diff --git a/zlib/.md5sum b/zlib/.md5sum index 5a73a3d..71abee4 100644 --- a/zlib/.md5sum +++ b/zlib/.md5sum @@ -1,2 +1 @@ -e0b1ddb828dbe6eda55abb992967463c zlib-1.2.5-lfs-decls.patch -be1e89810e66150f5b0327984d8625a0 zlib-1.2.5.tar.bz2 +2ab442d169156f34c379c968f3f482dd zlib-1.2.7.tar.bz2 diff --git a/zlib/Pkgfile b/zlib/Pkgfile index a0098f2..6ccc828 100644 --- a/zlib/Pkgfile +++ b/zlib/Pkgfile @@ -5,20 +5,15 @@ # Depends on: name=zlib -version=1.2.5 +version=1.2.7 release=2 -source=(http://dl.sourceforge.net/project/libpng/$name/$version/$name-$version.tar.bz2 \ - $name-$version-lfs-decls.patch) +source=(http://www.zlib.net/$name-$version.tar.bz2) build() { cd $name-$version - patch -p1 -i $SRC/$name-$version-lfs-decls.patch - - ./configure --prefix=/usr \ - --shared - - make AR="$AR rc" - make prefix=$PKG/usr mandir=$PKG/usr/man install - - chmod -v 644 $PKG/usr/lib/libz.a + ./configure --prefix=/usr --sharedlibdir=/lib + make + make DESTDIR=$PKG mandir=/usr/man install + ln -sf ../../lib/libz.so.$version $PKG/usr/lib/libz.so + rm $PKG/lib/libz.so } diff --git a/zlib/zlib-1.2.5-lfs-decls.patch b/zlib/zlib-1.2.5-lfs-decls.patch deleted file mode 100644 index 8d73430..0000000 --- a/zlib/zlib-1.2.5-lfs-decls.patch +++ /dev/null @@ -1,15 +0,0 @@ -http://bugs.gentoo.org/316377 - -try to unbreak over-eager LFS logic in zlib header - ---- zlib-1.2.5/zlib.h -+++ zlib-1.2.5/zlib.h -@@ -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));