[vlc-commits] contribs: archive: Don't try to build windows files implementation on UWP

[Hugo Beauzée-Luyssen]

vlc | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Fri Jun  2 12:13:59 2017 +0200| [faa6aaf1ac7da443be403b85a7c90abd36e6e8de] | committer: Hugo Beauzée-Luyssen

contribs: archive: Don't try to build windows files implementation on UWP

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

 contrib/src/libarchive/no-windows-files.patch | 10 ++++++++++
 contrib/src/libarchive/rules.mak              |  3 +++
 2 files changed, 13 insertions(+)

diff --git a/contrib/src/libarchive/no-windows-files.patch b/contrib/src/libarchive/no-windows-files.patch
new file mode 100644
index 0000000000..aa6ec78536
--- /dev/null
+++ b/contrib/src/libarchive/no-windows-files.patch
@@ -0,0 +1,10 @@
+--- libarchive/configure.ac.old	2017-06-01 16:09:59.930902994 +0200
++++ libarchive/configure.ac	2017-06-01 13:50:23.594103080 +0200
+@@ -91,6 +91,7 @@
+   *mingw* ) inc_windows_files=yes ;;
+   *cygwin* | *msys*) inc_cygwin_files=yes ;;
+ esac
++inc_windows_files=no
+ AM_CONDITIONAL([INC_WINDOWS_FILES], [test $inc_windows_files = yes])
+ AM_CONDITIONAL([INC_CYGWIN_FILES], [test $inc_cygwin_files = yes])
+ 
diff --git a/contrib/src/libarchive/rules.mak b/contrib/src/libarchive/rules.mak
index 4fa886c6aa..0145e49036 100644
--- a/contrib/src/libarchive/rules.mak
+++ b/contrib/src/libarchive/rules.mak
@@ -18,6 +18,9 @@ libarchive: libarchive-$(LIBARCHIVE_VERSION).tar.gz .sum-libarchive
 	$(UNPACK)
 	$(APPLY) $(SRC)/libarchive/0001-Fix-build-failure-without-STATVFS.patch
 	$(APPLY) $(SRC)/libarchive/android.patch
+ifdef HAVE_WINSTORE
+	$(APPLY) $(SRC)/libarchive/no-windows-files.patch
+endif
 	$(call pkg_static,"build/pkgconfig/libarchive.pc.in")
 	$(MOVE)