From: Tim Walker <tdskywalker@gmail.com>
Date: Thu, 4 Jan 2018 00:24:51 +0000 (+0100)
Subject: contrib/libxml2: explicitly disable LZMA support.
X-Git-Tag: 1.1.0~65
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=61dd23ba07f06ed2c2f8f06ce753ab40fc5e33cb;p=handbrake

contrib/libxml2: explicitly disable LZMA support.

Fix possible build failure, when liblzma
(xz) is found in pkg-config's search path.
---

diff --git a/contrib/libxml2/module.defs b/contrib/libxml2/module.defs
index bf17500d9..2e5e7cdcb 100644
--- a/contrib/libxml2/module.defs
+++ b/contrib/libxml2/module.defs
@@ -6,10 +6,12 @@ LIBXML2.FETCH.url     = https://download.handbrake.fr/handbrake/contrib/libxml2-
 LIBXML2.FETCH.url    += https://download.videolan.org/pub/contrib/libxml2/libxml2-2.9.4.tar.gz
 LIBXML2.FETCH.sha256  = ffb911191e509b966deb55de705387f14156e1a56b21824357cdf0053233633c
 
+# We don't need LZMA support
+LIBXML2.CONFIGURE.extra = --without-lzma
+
 # The Python components do not build on MinGW due to the lack of a select() call
 # in the MinGW environment.
-LIBXML2.CONFIGURE.extra = \
-    --without-python --without-threads
+LIBXML2.CONFIGURE.extra += --without-python --without-threads
 
 ifeq (1-msys,$(BUILD.cross)-$(HOST.system))
     LIBXML2.CONFIGURE.args.build = --build=$(BUILD.machine)-unknown-linux-gnu