summaryrefslogtreecommitdiff
path: root/patches/zlib
diff options
context:
space:
mode:
Diffstat (limited to 'patches/zlib')
-rw-r--r--patches/zlib/1.2.11/100-make-check-fail.patch33
-rw-r--r--patches/zlib/1.2.11/110-no-_wopen-cygwin.patch30
-rw-r--r--patches/zlib/1.2.11/120-mingw-static-only.patch25
3 files changed, 0 insertions, 88 deletions
diff --git a/patches/zlib/1.2.11/100-make-check-fail.patch b/patches/zlib/1.2.11/100-make-check-fail.patch
deleted file mode 100644
index 3852206..0000000
--- a/patches/zlib/1.2.11/100-make-check-fail.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-'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/patches/zlib/1.2.11/110-no-_wopen-cygwin.patch b/patches/zlib/1.2.11/110-no-_wopen-cygwin.patch
deleted file mode 100644
index 6704e3e..0000000
--- a/patches/zlib/1.2.11/110-no-_wopen-cygwin.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-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/patches/zlib/1.2.11/120-mingw-static-only.patch b/patches/zlib/1.2.11/120-mingw-static-only.patch
deleted file mode 100644
index 9eef00b..0000000
--- a/patches/zlib/1.2.11/120-mingw-static-only.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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