[vlc-commits] contribs: libarchive: Properly check for fork()

[Hugo Beauzée-Luyssen]

vlc | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Tue Jun 21 11:07:05 2016 +0200| [9a4ba9b0bda104c43c67e195bca25fc356c1540f] | committer: Hugo Beauzée-Luyssen

contribs: libarchive: Properly check for fork()

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9a4ba9b0bda104c43c67e195bca25fc356c1540f
---

 contrib/src/libarchive/properly-check-fork.patch | 17 +++++++++++++++++
 contrib/src/libarchive/rules.mak                 |  1 +
 2 files changed, 18 insertions(+)

diff --git a/contrib/src/libarchive/properly-check-fork.patch b/contrib/src/libarchive/properly-check-fork.patch
new file mode 100644
index 0000000..617e159
--- /dev/null
+++ b/contrib/src/libarchive/properly-check-fork.patch
@@ -0,0 +1,17 @@
+--- libarchive/libarchive/filter_fork_windows.c.orig	2016-06-20 19:24:11.105360670 +0200
++++ libarchive/libarchive/filter_fork_windows.c	2016-06-20 19:25:04.049377660 +0200
+@@ -25,7 +25,7 @@
+ 
+ #include "archive_platform.h"
+ 
+-#if defined(_WIN32) && !defined(__CYGWIN__)
++#if defined(_WIN32) && defined(HAVE_FORK)
+ #include "archive_cmdline_private.h"
+ #include "archive_string.h"
+ 
+@@ -187,4 +187,4 @@
+ 	Sleep(100);
+ }
+ 
+-#endif /* _WIN32 && !__CYGWIN__ */
++#endif /* _WIN32 && HAVE_FORK */
diff --git a/contrib/src/libarchive/rules.mak b/contrib/src/libarchive/rules.mak
index 31b8d38..901ecf8 100644
--- a/contrib/src/libarchive/rules.mak
+++ b/contrib/src/libarchive/rules.mak
@@ -15,6 +15,7 @@ $(TARBALLS)/libarchive-$(LIBARCHIVE_VERSION).tar.gz:
 libarchive: libarchive-$(LIBARCHIVE_VERSION).tar.gz .sum-libarchive
 	$(UNPACK)
 	$(APPLY) $(SRC)/libarchive/0001-Fix-build-failure-without-STATVFS.patch
+	$(APPLY) $(SRC)/libarchive/properly-check-fork.patch
 	$(MOVE)
 
 .libarchive: libarchive