X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/4d9cda52a1020a3687a12536ba3697be74db08b7..94448db595c2db8095a80c3d008a674ab82d0d6d:/package/zlib/patches/100-cross_compile.patch

diff --git a/package/zlib/patches/100-cross_compile.patch b/package/zlib/patches/100-cross_compile.patch
index b95ccf3f5..ff1c27f40 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	2005-07-18 04:25:21.000000000 +0200
++++ zlib-1.2.3/Makefile.in	2008-07-27 14:57:32.000000000 +0200
 @@ -25,20 +25,23 @@
  #           -Wstrict-prototypes -Wmissing-prototypes
  
@@ -51,7 +52,7 @@ diff -ruN zlib-1.2.3-orig/Makefile.in zlib-1.2.3-2/Makefile.in
  	rm -f $(SHAREDLIB) $(SHAREDLIBM)
  	ln -s $@ $(SHAREDLIB)
  	ln -s $@ $(SHAREDLIBM)
-@@ -90,23 +95,23 @@
+@@ -90,23 +95,22 @@
  	$(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS)
  
  install: $(LIBS)
@@ -78,7 +79,7 @@ diff -ruN zlib-1.2.3-orig/Makefile.in zlib-1.2.3-2/Makefile.in
  	  rm -f $(SHAREDLIB) $(SHAREDLIBM); \
  	  ln -s $(SHAREDLIBV) $(SHAREDLIB); \
  	  ln -s $(SHAREDLIBV) $(SHAREDLIBM); \
- 	  (ldconfig || true)  >/dev/null 2>&1; \
+-	  (ldconfig || true)  >/dev/null 2>&1; \
  	fi
 -	cp zlib.3 $(man3dir)
 -	chmod 644 $(man3dir)/zlib.3
@@ -86,10 +87,11 @@ diff -ruN zlib-1.2.3-orig/Makefile.in zlib-1.2.3-2/Makefile.in
 +	chmod 644 $(DESTDIR)$(man3dir)/zlib.3
  # 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	2005-07-11 22:11:57.000000000 +0200
++++ zlib-1.2.3/configure	2008-07-27 14:57:24.000000000 +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	2005-07-12 20:08:40.000000000 +0200
++++ zlib-1.2.3/contrib/minizip/Makefile	2008-07-27 14:57:24.000000000 +0200
 @@ -1,8 +1,8 @@
  CC=cc
 -CFLAGS=-O -I../..