X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=package%2Fzlib%2Fpatches%2F100-cross_compile.patch;h=5c82f1694cbf438174a3d96e2c86a729d65b2440;hb=4c6dc78fd91b9a4eb1ccc4383c9b455dfcc09229;hp=b95ccf3f5af011788410461f9030386b018a4e17;hpb=4d9cda52a1020a3687a12536ba3697be74db08b7;p=openwrt-10.03%2F.git

diff --git a/package/zlib/patches/100-cross_compile.patch b/package/zlib/patches/100-cross_compile.patch
index b95ccf3f5..5c82f1694 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../..