aboutsummaryrefslogtreecommitdiff
path: root/tools/depends/target/zlib
diff options
context:
space:
mode:
authorRechi <Rechi@users.noreply.github.com>2019-06-13 14:22:31 +0200
committerRechi <Rechi@users.noreply.github.com>2019-06-13 14:22:31 +0200
commitd32a1cfd78e8651f804b413168ba1ec3230005d3 (patch)
tree34757c2f68c7dfe26bf99677e003456e0b4a9ad9 /tools/depends/target/zlib
parent3ed3717530c51c4410fc7e20c09b73c196d7b071 (diff)
[depends] refresh zlib patches
Diffstat (limited to 'tools/depends/target/zlib')
-rw-r--r--tools/depends/target/zlib/Makefile4
-rw-r--r--tools/depends/target/zlib/remove_fixe_ar_osx.patch4
-rw-r--r--tools/depends/target/zlib/visibility.patch4
3 files changed, 6 insertions, 6 deletions
diff --git a/tools/depends/target/zlib/Makefile b/tools/depends/target/zlib/Makefile
index 7034bab733..89c33814d9 100644
--- a/tools/depends/target/zlib/Makefile
+++ b/tools/depends/target/zlib/Makefile
@@ -19,8 +19,8 @@ $(TARBALLS_LOCATION)/$(ARCHIVE):
$(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS)
rm -rf $(PLATFORM); mkdir -p $(PLATFORM)
cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
- cd $(PLATFORM); patch -p0 < ../visibility.patch
- cd $(PLATFORM); patch -p0 < ../remove_fixe_ar_osx.patch
+ cd $(PLATFORM); patch -p1 -i ../visibility.patch
+ cd $(PLATFORM); patch -p1 -i ../remove_fixe_ar_osx.patch
cd $(PLATFORM); $(CONFIGURE)
$(LIBDYLIB): $(PLATFORM)
diff --git a/tools/depends/target/zlib/remove_fixe_ar_osx.patch b/tools/depends/target/zlib/remove_fixe_ar_osx.patch
index 8eb2412fce..1eaabff3ba 100644
--- a/tools/depends/target/zlib/remove_fixe_ar_osx.patch
+++ b/tools/depends/target/zlib/remove_fixe_ar_osx.patch
@@ -1,5 +1,5 @@
---- configure 2012-05-02 06:17:08.000000000 +0200
-+++ configure.new 2017-04-26 18:42:06.000000000 +0200
+--- a/configure
++++ b/configure
@@ -241,12 +241,7 @@
SHAREDLIBV=libz.$VER$shared_ext
SHAREDLIBM=libz.$VER1$shared_ext
diff --git a/tools/depends/target/zlib/visibility.patch b/tools/depends/target/zlib/visibility.patch
index 8c5159e6df..3257f7fedb 100644
--- a/tools/depends/target/zlib/visibility.patch
+++ b/tools/depends/target/zlib/visibility.patch
@@ -1,5 +1,5 @@
---- zconf.h.in 2013-01-23 21:22:22.512584179 -0500
-+++ zconf.h.in 2013-01-23 21:21:56.312584196 -0500
+--- a/zconf.h.in
++++ b/zconf.h.in
@@ -374,7 +374,11 @@
#endif