diff options
author | Alexey Neyman <stilor@att.net> | 2017-05-19 21:58:46 -0700 |
---|---|---|
committer | Alexey Neyman <stilor@att.net> | 2017-07-08 10:57:56 -0700 |
commit | e7deac3aad394325f9e6fc6fda41d34ec94a59e0 (patch) | |
tree | 6ad88362f0bfa8385a91eb494009a4646aeb74b6 /packages/zlib | |
parent | b9af225f58e45c7fae7eb9d3689fe939243e7578 (diff) | |
download | crosstool-ng-e7deac3aad394325f9e6fc6fda41d34ec94a59e0.tar.gz crosstool-ng-e7deac3aad394325f9e6fc6fda41d34ec94a59e0.tar.bz2 crosstool-ng-e7deac3aad394325f9e6fc6fda41d34ec94a59e0.zip |
Switch comp.libs/tools and debug to new framework.
Signed-off-by: Alexey Neyman <stilor@att.net>
Diffstat (limited to 'packages/zlib')
-rw-r--r-- | packages/zlib/1.2.11/100-make-check-fail.patch | 33 | ||||
-rw-r--r-- | packages/zlib/1.2.11/110-no-_wopen-cygwin.patch | 30 | ||||
-rw-r--r-- | packages/zlib/1.2.11/120-mingw-static-only.patch | 25 | ||||
-rw-r--r-- | packages/zlib/1.2.11/version.desc | 0 | ||||
-rw-r--r-- | packages/zlib/package.desc | 1 |
5 files changed, 89 insertions, 0 deletions
diff --git a/packages/zlib/1.2.11/100-make-check-fail.patch b/packages/zlib/1.2.11/100-make-check-fail.patch new file mode 100644 index 00000000..38522063 --- /dev/null +++ b/packages/zlib/1.2.11/100-make-check-fail.patch @@ -0,0 +1,33 @@ +'make check' should return with non-zero status + +... 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 +@@ -91,7 +91,7 @@ + echo ' *** zlib test OK ***'; \ + else \ + echo ' *** zlib test FAILED ***'; false; \ +- fi; \ ++ fi + rm -f $$TMPST + + testshared: shared +@@ -104,7 +104,7 @@ + echo ' *** zlib shared test OK ***'; \ + else \ + echo ' *** zlib shared test FAILED ***'; false; \ +- fi; \ ++ fi + rm -f $$TMPSH + + test64: all64 +@@ -113,7 +113,7 @@ + echo ' *** zlib 64-bit test OK ***'; \ + else \ + echo ' *** zlib 64-bit test FAILED ***'; false; \ +- fi; \ ++ fi + rm -f $$TMP64 + + infcover.o: $(SRCDIR)test/infcover.c $(SRCDIR)zlib.h zconf.h diff --git a/packages/zlib/1.2.11/110-no-_wopen-cygwin.patch b/packages/zlib/1.2.11/110-no-_wopen-cygwin.patch new file mode 100644 index 00000000..6704e3e1 --- /dev/null +++ b/packages/zlib/1.2.11/110-no-_wopen-cygwin.patch @@ -0,0 +1,30 @@ +From a5e814c69315f3b7528418f6a5185c4f8a9dc250 Mon Sep 17 00:00:00 2001 +From: Alexey Neyman <stilor@att.net> +Date: Wed, 15 Feb 2017 22:36:35 -0800 +Subject: [PATCH] Fix unresolved reference to _wopen on Cygwin + +The default Cygwin GCC/glibc do not provide _wopen. This seems to be +part of Win32API, which is provided by x86-w64-mingw32-gcc - but that +compiler does not define __CYGWIN__, it defines _WIN32. + +Signed-off-by: Alexey Neyman <stilor@att.net> +--- + 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 @@ + # include <io.h> + #endif + +-#if defined(_WIN32) || defined(__CYGWIN__) ++#if defined(_WIN32) + # 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/120-mingw-static-only.patch new file mode 100644 index 00000000..9eef00b8 --- /dev/null +++ b/packages/zlib/1.2.11/120-mingw-static-only.patch @@ -0,0 +1,25 @@ +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 + gzwrite.o infback.o inffast.o inflate.o inftrees.o trees.o uncompr.o zutil.o + OBJA = + +-all: $(STATICLIB) $(SHAREDLIB) $(IMPLIB) example.exe minigzip.exe example_d.exe minigzip_d.exe ++all: $(STATICLIB) example.exe minigzip.exe ++ ++ifeq ($(SHARED_MODE),1) ++all: $(SHAREDLIB) $(IMPLIB) example_d.exe minigzip_d.exe ++endif + + test: example.exe minigzip.exe + ./example +@@ -125,7 +129,7 @@ zlibrc.o: win32/zlib1.rc + .PHONY: install uninstall clean + + install: zlib.h zconf.h $(STATICLIB) $(IMPLIB) +- @if test -z "$(DESTDIR)$(INCLUDE_PATH)" -o -z "$(DESTDIR)$(LIBRARY_PATH)" -o -z "$(DESTDIR)$(BINARY_PATH)"; then \ ++ @if test -z "$(INCLUDE_PATH)" -o -z "$(LIBRARY_PATH)" -o -z "$(BINARY_PATH)"; then \ + echo INCLUDE_PATH, LIBRARY_PATH, and BINARY_PATH must be specified; \ + exit 1; \ + fi diff --git a/packages/zlib/1.2.11/version.desc b/packages/zlib/1.2.11/version.desc new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/packages/zlib/1.2.11/version.desc diff --git a/packages/zlib/package.desc b/packages/zlib/package.desc new file mode 100644 index 00000000..eea24eb0 --- /dev/null +++ b/packages/zlib/package.desc @@ -0,0 +1 @@ +repository="git https://github.com/madler/zlib.git" |