diff options
author | Alexey Neyman <stilor@att.net> | 2017-12-02 23:30:38 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-02 23:30:38 (GMT) |
commit | d917a29865876b913fe2939ee2a0728145e8543a (patch) | |
tree | 4e048ed57988306696efa3c5b81a80d48030e913 /packages/zlib/1.2.11/120-mingw-static-only.patch | |
parent | e832b9b220f90b11b893e2815ceb37ec2b708683 (diff) | |
parent | 98bc4decdeab1361bdc585c86591718fb08c8ffb (diff) |
Merge pull request #874 from stilor/renumber-update-patches
Renumber & update patches
Diffstat (limited to 'packages/zlib/1.2.11/120-mingw-static-only.patch')
-rw-r--r-- | packages/zlib/1.2.11/120-mingw-static-only.patch | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/packages/zlib/1.2.11/120-mingw-static-only.patch b/packages/zlib/1.2.11/120-mingw-static-only.patch deleted file mode 100644 index 9eef00b..0000000 --- a/packages/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 |