From 753236ea224998cb06c695947bfbd0b27f1a74df Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Tue, 23 May 2017 19:23:28 -0700 Subject: Handle ming32 as a host zlib refuses to run configure with mingw32 host and insists that win32/Makefile.gcc is used instead. This requires a change in this Makefile to support static-only builds. Fixes #694. Signed-off-by: Alexey Neyman --- patches/zlib/1.2.11/120-mingw-static-only.patch | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 patches/zlib/1.2.11/120-mingw-static-only.patch (limited to 'patches/zlib/1.2.11/120-mingw-static-only.patch') diff --git a/patches/zlib/1.2.11/120-mingw-static-only.patch b/patches/zlib/1.2.11/120-mingw-static-only.patch new file mode 100644 index 00000000..9eef00b8 --- /dev/null +++ b/patches/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 -- cgit v1.2.3