From b64780d0cfb9d165e6c4e2f0e8c65899c93bdb07 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Tue, 15 Mar 2011 08:19:57 +0000 Subject: [PATCH] zlib: update to 1.2.5 --- zlib/.footprint | 8 +-- zlib/.md5sum | 4 +- zlib/Pkgfile | 6 +-- zlib/zlib-1.2.3-fPIC-1.patch | 93 --------------------------------- zlib/zlib-1.2.5-lfs-decls.patch | 15 ++++++ 5 files changed, 25 insertions(+), 101 deletions(-) delete mode 100644 zlib/zlib-1.2.3-fPIC-1.patch create mode 100644 zlib/zlib-1.2.5-lfs-decls.patch diff --git a/zlib/.footprint b/zlib/.footprint index 566b368..f7f7ba2 100644 --- a/zlib/.footprint +++ b/zlib/.footprint @@ -4,9 +4,11 @@ drwxr-xr-x root/root usr/include/ -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.3 -lrwxrwxrwx root/root usr/lib/libz.so.1 -> libz.so.1.2.3 --rwxr-xr-x root/root usr/lib/libz.so.1.2.3 +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 +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/ drwxr-xr-x root/root usr/man/man3/ -rw-r--r-- root/root usr/man/man3/zlib.3.gz diff --git a/zlib/.md5sum b/zlib/.md5sum index 59c7969..5a73a3d 100644 --- a/zlib/.md5sum +++ b/zlib/.md5sum @@ -1,2 +1,2 @@ -545d60b20bfde6f53023de44438cef59 zlib-1.2.3-fPIC-1.patch -dee233bf288ee795ac96a98cc2e369b6 zlib-1.2.3.tar.bz2 +e0b1ddb828dbe6eda55abb992967463c zlib-1.2.5-lfs-decls.patch +be1e89810e66150f5b0327984d8625a0 zlib-1.2.5.tar.bz2 diff --git a/zlib/Pkgfile b/zlib/Pkgfile index 4c3fe47..cd1c589 100644 --- a/zlib/Pkgfile +++ b/zlib/Pkgfile @@ -5,14 +5,14 @@ # Depends on: name=zlib -version=1.2.3 +version=1.2.5 release=1 source=(http://dl.sourceforge.net/project/libpng/$name/$version/$name-$version.tar.bz2 \ - http://svn.cross-lfs.org/svn/repos/cross-lfs/branches/clfs-sysroot/patches/$name-$version-fPIC-1.patch) + $name-$version-lfs-decls.patch) build() { cd $name-$version - patch -Np1 -i ../$name-$version-fPIC-1.patch + patch -p1 -i $SRC/$name-$version-lfs-decls.patch ./configure --prefix=/usr \ --shared diff --git a/zlib/zlib-1.2.3-fPIC-1.patch b/zlib/zlib-1.2.3-fPIC-1.patch deleted file mode 100644 index 9205f91..0000000 --- a/zlib/zlib-1.2.3-fPIC-1.patch +++ /dev/null @@ -1,93 +0,0 @@ -Submitted By: Tushar Teredesai -Date: 2005-06-14 -Initial Package Version: 1.2.2 -Origin: Gentoo ebuild? -Upstream Status: Not submitted -Description: - 1. Build shared and static lib in one pass - 2. Always add -fPIC when building shared lib, don't expect the user to set it. - -To build the shared and static library: - ./configure --prefix= --shared && - make && - make install -Remove the --shared if you don't want the shared lib. - -diff -Naur zlib-1.2.2.orig/configure zlib-1.2.2/configure ---- zlib-1.2.2.orig/configure 2004-09-07 00:50:06.000000000 -0500 -+++ zlib-1.2.2/configure 2005-02-05 01:34:08.553292416 -0600 -@@ -73,7 +73,11 @@ - - if test "$gcc" -eq 1 && ($cc -c $cflags $test.c) 2>/dev/null; then - CC="$cc" -- SFLAGS=${CFLAGS-"-fPIC -O3"} -+ #SFLAGS=${CFLAGS-"-fPIC -O3"} -+ # the above is horribly wrong on a few archs where -fPIC should ALWAYS be -+ # used in the creation of shared libraries. without the following, the -+ # shared lib test will sometimes fail even when shared libs -can- be created. -+ SFLAGS="${CFLAGS-"-O3"} -fPIC" - CFLAGS="$cflags" - case `(uname -s || echo unknown) 2>/dev/null` in - Linux | linux | GNU | GNU/*) LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1"};; -@@ -158,7 +162,7 @@ - if test "`($CC -c $SFLAGS $test.c) 2>&1`" = "" && - test "`($LDSHARED -o $test$shared_ext $test.o) 2>&1`" = ""; then - CFLAGS="$SFLAGS" -- LIBS="$SHAREDLIBV" -+ LIBS="$LIBS $SHAREDLIBV" - echo Building shared library $SHAREDLIBV with $CC. - elif test -z "$old_cc" -a -z "$old_cflags"; then - echo No shared library support. -diff -Naur zlib-1.2.2.orig/Makefile.in zlib-1.2.2/Makefile.in ---- zlib-1.2.2.orig/Makefile.in 2004-09-15 09:27:20.000000000 -0500 -+++ zlib-1.2.2/Makefile.in 2005-02-05 01:33:49.703158072 -0600 -@@ -49,6 +49,8 @@ - OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \ - zutil.o inflate.o infback.o inftrees.o inffast.o - -+PIC_OBJS = $(OBJS:%.o=%.lo) -+ - OBJA = - # to use the asm code: make OBJA=match.o - -@@ -77,8 +79,11 @@ - mv _match.o match.o - rm -f _match.s - --$(SHAREDLIBV): $(OBJS) -- $(LDSHARED) -o $@ $(OBJS) -+%.lo: %.c -+ $(CC) $(CFLAGS) -DPIC -fPIC -c $< -o $@ -+ -+$(SHAREDLIBV): $(PIC_OBJS) -+ $(LDSHARED) -o $@ $(PIC_OBJS) -lc - rm -f $(SHAREDLIB) $(SHAREDLIBM) - ln -s $@ $(SHAREDLIB) - ln -s $@ $(SHAREDLIBM) -@@ -89,13 +94,10 @@ - minigzip$(EXE): minigzip.o $(LIBS) - $(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS) - --install: $(LIBS) -+install-libs: $(LIBS) - -@if [ ! -d $(exec_prefix) ]; then mkdir -p $(exec_prefix); fi -- -@if [ ! -d $(includedir) ]; then mkdir -p $(includedir); fi - -@if [ ! -d $(libdir) ]; then mkdir -p $(libdir); fi - -@if [ ! -d $(man3dir) ]; then mkdir -p $(man3dir); fi -- cp zlib.h zconf.h $(includedir) -- chmod 644 $(includedir)/zlib.h $(includedir)/zconf.h - cp $(LIBS) $(libdir) - cd $(libdir); chmod 755 $(LIBS) - -@(cd $(libdir); $(RANLIB) libz.a || true) >/dev/null 2>&1 -@@ -110,6 +112,11 @@ - # The ranlib in install is needed on NeXTSTEP which checks file times - # ldconfig is for Linux - -+install: install-libs -+ -@if [ ! -d $(includedir) ]; then mkdir $(includedir); fi -+ cp zlib.h zconf.h $(includedir) -+ chmod 644 $(includedir)/zlib.h $(includedir)/zconf.h -+ - uninstall: - cd $(includedir); \ - cd $(libdir); rm -f libz.a; \ diff --git a/zlib/zlib-1.2.5-lfs-decls.patch b/zlib/zlib-1.2.5-lfs-decls.patch new file mode 100644 index 0000000..8d73430 --- /dev/null +++ b/zlib/zlib-1.2.5-lfs-decls.patch @@ -0,0 +1,15 @@ +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)); -- 2.26.2