]> granicus.if.org Git - handbrake/commitdiff
contrib/libxml2: explicitly disable LZMA support.
authorTim Walker <tdskywalker@gmail.com>
Thu, 4 Jan 2018 00:24:51 +0000 (01:24 +0100)
committerScott <628593+sr55@users.noreply.github.com>
Sun, 14 Jan 2018 15:36:17 +0000 (15:36 +0000)
Fix possible build failure, when liblzma
(xz) is found in pkg-config's search path.

contrib/libxml2/module.defs

index bf17500d92a5fa9b0e840fb874b32917dcd6f6aa..2e5e7cdcba533df39909e4c08d4b0ed0d6ba8a20 100644 (file)
@@ -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