diff options
| author | wbx <wbx@hydrogenium.(none)> | 2009-05-17 14:41:34 +0200 |
|---|---|---|
| committer | wbx <wbx@hydrogenium.(none)> | 2009-05-17 14:41:34 +0200 |
| commit | 219a6dab8995aad9ac4860cc1a84d6f3509a03a4 (patch) | |
| tree | b9c0f3c43aebba2fcfef777592d0add39f2072f4 /package/zlib/patches | |
Initial import
Diffstat (limited to 'package/zlib/patches')
| -rw-r--r-- | package/zlib/patches/patch-Makefile_in | 20 | ||||
| -rw-r--r-- | package/zlib/patches/patch-configure | 38 |
2 files changed, 58 insertions, 0 deletions
diff --git a/package/zlib/patches/patch-Makefile_in b/package/zlib/patches/patch-Makefile_in new file mode 100644 index 000000000..c34514a03 --- /dev/null +++ b/package/zlib/patches/patch-Makefile_in @@ -0,0 +1,20 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- zlib-1.2.3.orig/Makefile.in 2005-07-18 04:25:21.000000000 +0200 ++++ zlib-1.2.3/Makefile.in 2008-12-31 16:32:48.417074167 +0100 +@@ -34,6 +34,7 @@ SHAREDLIBV=libz.so.1.2.3 + SHAREDLIBM=libz.so.1 + + AR=ar rc ++ARFLAGS=rc + RANLIB=ranlib + TAR=tar + SHELL=/bin/sh +@@ -68,7 +69,7 @@ test: all + fi + + libz.a: $(OBJS) $(OBJA) +- $(AR) $@ $(OBJS) $(OBJA) ++ $(AR) $(ARFLAGS) $@ $(OBJS) $(OBJA) + -@ ($(RANLIB) $@ || true) >/dev/null 2>&1 + + match.o: match.S diff --git a/package/zlib/patches/patch-configure b/package/zlib/patches/patch-configure new file mode 100644 index 000000000..784f624b5 --- /dev/null +++ b/package/zlib/patches/patch-configure @@ -0,0 +1,38 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- zlib-1.2.3.orig/configure 2005-07-11 22:11:57.000000000 +0200 ++++ zlib-1.2.3/configure 2008-12-31 16:43:55.922789768 +0100 +@@ -73,32 +73,9 @@ esac + + if test "$gcc" -eq 1 && ($cc -c $cflags $test.c) 2>/dev/null; then + CC="$cc" +- SFLAGS=${CFLAGS-"-fPIC -O3"} ++ SFLAGS=${CFLAGS-"-fPIC -D_REENTRANT"} + CFLAGS="$cflags" +- case `(uname -s || echo unknown) 2>/dev/null` in +- Linux | linux | GNU | GNU/*) LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1"};; +- CYGWIN* | Cygwin* | cygwin* | OS/2* ) +- EXE='.exe';; +- QNX*) # This is for QNX6. I suppose that the QNX rule below is for QNX2,QNX4 +- # (alain.bonnefoy@icbt.com) +- LDSHARED=${LDSHARED-"$cc -shared -Wl,-hlibz.so.1"};; +- HP-UX*) +- LDSHARED=${LDSHARED-"$cc -shared $SFLAGS"} +- case `(uname -m || echo unknown) 2>/dev/null` in +- ia64) +- shared_ext='.so' +- SHAREDLIB='libz.so';; +- *) +- shared_ext='.sl' +- SHAREDLIB='libz.sl';; +- esac;; +- Darwin*) shared_ext='.dylib' +- SHAREDLIB=libz$shared_ext +- SHAREDLIBV=libz.$VER$shared_ext +- SHAREDLIBM=libz.$VER1$shared_ext +- LDSHARED=${LDSHARED-"$cc -dynamiclib -install_name $libdir/$SHAREDLIBM -compatibility_version $VER1 -current_version $VER"};; +- *) LDSHARED=${LDSHARED-"$cc -shared"};; +- esac ++ LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1"} + else + # find system name and corresponding cc options + CC=${CC-cc} |