[vlc-commits] contrib: libarchive: build without openssl on Windows

Steve Lhomme git at videolan.org
Tue May 15 18:34:54 CEST 2018


vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Mon May 14 08:51:16 2018 +0200| [20dd99a80c6253fc0ce16ad1eeb2e0e97c2e356f] | committer: Steve Lhomme

contrib: libarchive: build without openssl on Windows

That's what the bot does.
It may make sense on all platforms.

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

 contrib/src/libarchive/rules.mak | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/contrib/src/libarchive/rules.mak b/contrib/src/libarchive/rules.mak
index 4daae3ea25..3721a0e932 100644
--- a/contrib/src/libarchive/rules.mak
+++ b/contrib/src/libarchive/rules.mak
@@ -14,6 +14,10 @@ LIBARCHIVE_CONF := $(HOSTCONF) \
 		--without-nettle --without-cng \
 		--without-xml2 --without-lzma --without-iconv --without-expat
 
+ifdef HAVE_WIN32
+LIBARCHIVE_CONF += --without-openssl
+endif
+
 $(TARBALLS)/libarchive-$(LIBARCHIVE_VERSION).tar.gz:
 	$(call download_pkg,$(LIBARCHIVE_URL),libarchive)
 



More information about the vlc-commits mailing list