contribs: archive: Don't try to build windows files implementation on UWP
authorHugo Beauzée-Luyssen <hugo@beauzee.fr>
Fri, 2 Jun 2017 10:13:59 +0000 (12:13 +0200)
committerHugo Beauzée-Luyssen <hugo@beauzee.fr>
Fri, 2 Jun 2017 15:56:28 +0000 (17:56 +0200)
contrib/src/libarchive/no-windows-files.patch [new file with mode: 0644]
contrib/src/libarchive/rules.mak

diff --git a/contrib/src/libarchive/no-windows-files.patch b/contrib/src/libarchive/no-windows-files.patch
new file mode 100644 (file)
index 0000000..aa6ec78
--- /dev/null
@@ -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])
index 4fa886c..0145e49 100644 (file)
@@ -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)