summaryrefslogtreecommitdiff
path: root/external/libxml2
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2014-01-09 21:14:48 +0100
committerCaolán McNamara <caolanm@redhat.com>2014-01-10 19:49:09 +0000
commit39872b0e50806541f14ab7200b9a627e7323a29c (patch)
tree03c1489d964e7348444f22b75fa9edc90befa280 /external/libxml2
parentf2394e4c9cd7a27a1eb1e0e2476997fd18ae2508 (diff)
libxml2: don't grow dependency on liblzma if that happens to be installed
Change-Id: Ifd46fc5dc531bd5bdb489c7550476f9c07a0a976 (cherry picked from commit b202af672cf7d1825b68adc352374031bf68c6f2) Reviewed-on: https://gerrit.libreoffice.org/7345 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'external/libxml2')
-rw-r--r--external/libxml2/ExternalProject_xml2.mk2
1 files changed, 2 insertions, 0 deletions
diff --git a/external/libxml2/ExternalProject_xml2.mk b/external/libxml2/ExternalProject_xml2.mk
index a2d613d8c8d6..5d8eba48de44 100644
--- a/external/libxml2/ExternalProject_xml2.mk
+++ b/external/libxml2/ExternalProject_xml2.mk
@@ -18,6 +18,7 @@ ifeq ($(COM),GCC)
$(call gb_ExternalProject_get_state_target,xml2,build):
$(call gb_ExternalProject_run,build,\
./configure --disable-ipv6 --without-python --without-zlib \
+ --without-lzma \
--disable-static --without-debug lt_cv_cc_dll_switch="-shared" \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
CC="$(CC) -mthreads $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \
@@ -39,6 +40,7 @@ else # OS!=WNT
$(call gb_ExternalProject_get_state_target,xml2,build):
$(call gb_ExternalProject_run,build,\
./configure --disable-ipv6 --without-python --without-zlib --with-sax1 \
+ --without-lzma \
$(if $(debug),--with-run-debug) \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________URELIB) \