diff options
| author | Alexey Neyman <stilor@att.net> | 2017-12-02 12:44:39 -0800 |
|---|---|---|
| committer | Alexey Neyman <stilor@att.net> | 2017-12-02 12:44:39 -0800 |
| commit | 98bc4decdeab1361bdc585c86591718fb08c8ffb (patch) | |
| tree | 4e048ed57988306696efa3c5b81a80d48030e913 /packages/zlib | |
| parent | 2a1935f3ad41d360dd3d96a1b0486083293651dd (diff) | |
| download | crosstool-ng-98bc4decdeab1361bdc585c86591718fb08c8ffb.tar.gz crosstool-ng-98bc4decdeab1361bdc585c86591718fb08c8ffb.tar.bz2 crosstool-ng-98bc4decdeab1361bdc585c86591718fb08c8ffb.zip | |
Run all patches through renumbering and update
Signed-off-by: Alexey Neyman <stilor@att.net>
Diffstat (limited to 'packages/zlib')
| -rw-r--r-- | packages/zlib/1.2.11/0000-make-check-fail.patch (renamed from packages/zlib/1.2.11/100-make-check-fail.patch) | 8 | ||||
| -rw-r--r-- | packages/zlib/1.2.11/0001-no-_wopen-cygwin.patch (renamed from packages/zlib/1.2.11/110-no-_wopen-cygwin.patch) | 7 | ||||
| -rw-r--r-- | packages/zlib/1.2.11/0002-mingw-static-only.patch (renamed from packages/zlib/1.2.11/120-mingw-static-only.patch) | 13 |
3 files changed, 15 insertions, 13 deletions
diff --git a/packages/zlib/1.2.11/100-make-check-fail.patch b/packages/zlib/1.2.11/0000-make-check-fail.patch index 38522063..203a5178 100644 --- a/packages/zlib/1.2.11/100-make-check-fail.patch +++ b/packages/zlib/1.2.11/0000-make-check-fail.patch @@ -2,8 +2,12 @@ ... if the test fails. ---- zlib-1.2.11/Makefile.in.orig 2017-02-11 12:00:37.768094420 -0800 -+++ zlib-1.2.11/Makefile.in 2017-02-11 12:01:02.088399001 -0800 +--- + Makefile.in | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +--- a/Makefile.in ++++ b/Makefile.in @@ -91,7 +91,7 @@ echo ' *** zlib test OK ***'; \ else \ diff --git a/packages/zlib/1.2.11/110-no-_wopen-cygwin.patch b/packages/zlib/1.2.11/0001-no-_wopen-cygwin.patch index 6704e3e1..67085bab 100644 --- a/packages/zlib/1.2.11/110-no-_wopen-cygwin.patch +++ b/packages/zlib/1.2.11/0001-no-_wopen-cygwin.patch @@ -9,11 +9,9 @@ compiler does not define __CYGWIN__, it defines _WIN32. Signed-off-by: Alexey Neyman <stilor@att.net> --- - gzguts.h | 2 +- + gzguts.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/gzguts.h b/gzguts.h -index 990a4d2..6378d46 100644 --- a/gzguts.h +++ b/gzguts.h @@ -39,7 +39,7 @@ @@ -25,6 +23,3 @@ index 990a4d2..6378d46 100644 # define WIDECHAR #endif --- -2.9.3 - diff --git a/packages/zlib/1.2.11/120-mingw-static-only.patch b/packages/zlib/1.2.11/0002-mingw-static-only.patch index 9eef00b8..6d5c89c5 100644 --- a/packages/zlib/1.2.11/120-mingw-static-only.patch +++ b/packages/zlib/1.2.11/0002-mingw-static-only.patch @@ -1,7 +1,10 @@ -diff -urpN zlib-1.2.11.orig/win32/Makefile.gcc zlib-1.2.11/win32/Makefile.gcc ---- zlib-1.2.11.orig/win32/Makefile.gcc 2017-05-23 18:52:07.937730080 -0700 -+++ zlib-1.2.11/win32/Makefile.gcc 2017-05-23 19:02:24.068666463 -0700 -@@ -71,7 +71,11 @@ OBJS = adler32.o compress.o crc32.o defl +--- + win32/Makefile.gcc | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +--- a/win32/Makefile.gcc ++++ b/win32/Makefile.gcc +@@ -71,7 +71,11 @@ gzwrite.o infback.o inffast.o inflate.o inftrees.o trees.o uncompr.o zutil.o OBJA = @@ -14,7 +17,7 @@ diff -urpN zlib-1.2.11.orig/win32/Makefile.gcc zlib-1.2.11/win32/Makefile.gcc test: example.exe minigzip.exe ./example -@@ -125,7 +129,7 @@ zlibrc.o: win32/zlib1.rc +@@ -125,7 +129,7 @@ .PHONY: install uninstall clean install: zlib.h zconf.h $(STATICLIB) $(IMPLIB) |