diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2007-06-04 11:25:53 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2007-06-04 11:25:53 +0000 |
| commit | 12a81e859f38f85f5143e72b56b5a1f974c53576 (patch) | |
| tree | b2d994878969d3f9d2d56625fccda64c5ac25e8a /package/zlib | |
| parent | ac587815b0f46cdc8eb7d7141ffb5784b98b4b3b (diff) | |
| download | master-187ad058-12a81e859f38f85f5143e72b56b5a1f974c53576.tar.gz master-187ad058-12a81e859f38f85f5143e72b56b5a1f974c53576.tar.bz2 master-187ad058-12a81e859f38f85f5143e72b56b5a1f974c53576.zip | |
refresh all package patches in the buildroot using quilt
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7490 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/zlib')
| -rw-r--r-- | package/zlib/patches/100-cross_compile.patch | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/package/zlib/patches/100-cross_compile.patch b/package/zlib/patches/100-cross_compile.patch index b95ccf3f5a..5c82f1694c 100644 --- a/package/zlib/patches/100-cross_compile.patch +++ b/package/zlib/patches/100-cross_compile.patch @@ -1,6 +1,7 @@ -diff -ruN zlib-1.2.3-orig/Makefile.in zlib-1.2.3-2/Makefile.in ---- zlib-1.2.3-orig/Makefile.in 2005-07-18 10:25:21.000000000 +0800 -+++ zlib-1.2.3-2/Makefile.in 2006-10-16 21:23:27.000000000 +0800 +Index: zlib-1.2.3/Makefile.in +=================================================================== +--- zlib-1.2.3.orig/Makefile.in 2007-06-04 13:24:03.760040896 +0200 ++++ zlib-1.2.3/Makefile.in 2007-06-04 13:24:03.839028888 +0200 @@ -25,20 +25,23 @@ # -Wstrict-prototypes -Wmissing-prototypes @@ -87,9 +88,10 @@ diff -ruN zlib-1.2.3-orig/Makefile.in zlib-1.2.3-2/Makefile.in # The ranlib in install is needed on NeXTSTEP which checks file times # ldconfig is for Linux -diff -ruN zlib-1.2.3-orig/configure zlib-1.2.3-2/configure ---- zlib-1.2.3-orig/configure 2005-07-12 04:11:57.000000000 +0800 -+++ zlib-1.2.3-2/configure 2006-10-16 21:25:38.000000000 +0800 +Index: zlib-1.2.3/configure +=================================================================== +--- zlib-1.2.3.orig/configure 2007-06-04 13:24:03.765040136 +0200 ++++ zlib-1.2.3/configure 2007-06-04 13:24:03.839028888 +0200 @@ -23,7 +23,7 @@ VER=`sed -n -e '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h` VER2=`sed -n -e '/VERSION "/s/.*"\([0-9]*\\.[0-9]*\)\\..*/\1/p' < zlib.h` @@ -202,9 +204,10 @@ diff -ruN zlib-1.2.3-orig/configure zlib-1.2.3-2/configure +/^mandir *=/s%=.*%= $mandir% +/^LDFLAGS *=/s%=.*%= $LDFLAGS% " > Makefile -diff -ruN zlib-1.2.3-orig/contrib/minizip/Makefile zlib-1.2.3-2/contrib/minizip/Makefile ---- zlib-1.2.3-orig/contrib/minizip/Makefile 2005-07-13 02:08:40.000000000 +0800 -+++ zlib-1.2.3-2/contrib/minizip/Makefile 2006-10-16 21:23:27.000000000 +0800 +Index: zlib-1.2.3/contrib/minizip/Makefile +=================================================================== +--- zlib-1.2.3.orig/contrib/minizip/Makefile 2007-06-04 13:24:03.773038920 +0200 ++++ zlib-1.2.3/contrib/minizip/Makefile 2007-06-04 13:24:03.839028888 +0200 @@ -1,8 +1,8 @@ CC=cc -CFLAGS=-O -I../.. |