[vlc-devel] [PATCH 2/2] contrib:libarchive: force static build

[Steve Lhomme]

When linking on Windows it assumes by default we link with DLLs.
---
 contrib/src/libarchive/rules.mak          |  1 +
 contrib/src/libarchive/static-build.patch | 10 ++++++++++
 2 files changed, 11 insertions(+)
 create mode 100644 contrib/src/libarchive/static-build.patch

diff --git a/contrib/src/libarchive/rules.mak b/contrib/src/libarchive/rules.mak
index b0d949d..44c7162 100644
--- a/contrib/src/libarchive/rules.mak
+++ b/contrib/src/libarchive/rules.mak
@@ -25,6 +25,7 @@ ifdef HAVE_WINSTORE
 	$(APPLY) $(SRC)/libarchive/winrt.patch
 endif
 	$(APPLY) $(SRC)/libarchive/fix-types.patch
+	$(APPLY) $(SRC)/libarchive/static-build.patch
 	$(call pkg_static,"build/pkgconfig/libarchive.pc.in")
 	$(MOVE)
 
diff --git a/contrib/src/libarchive/static-build.patch b/contrib/src/libarchive/static-build.patch
new file mode 100644
index 0000000..00ad382
--- /dev/null
+++ b/contrib/src/libarchive/static-build.patch
@@ -0,0 +1,10 @@
+--- libarchive/build/pkgconfig/libarchive.pc.in	2017-07-18 16:12:39.351332200 +0200
++++ libarchive/build/pkgconfig/libarchive.pc.in.static	2017-07-18 16:12:16.108486200 +0200
+@@ -6,6 +6,6 @@ includedir=@includedir@
+ Name: libarchive
+ Description: library that can create and read several streaming archive formats
+ Version: @VERSION@
+-Cflags: -I${includedir}
++Cflags: -I${includedir} -DLIBARCHIVE_STATIC
+ Libs: -L${libdir} -larchive
+ Libs.private: @LIBS@
-- 
2.10.1.windows.1