Kaydet (Commit) b202af67 authored tarafından Michael Stahl's avatar Michael Stahl

libxml2: don't grow dependency on liblzma if that happens to be installed

Change-Id: Ifd46fc5dc531bd5bdb489c7550476f9c07a0a976
üst 3bdb7810
...@@ -18,6 +18,7 @@ ifeq ($(COM),GCC) ...@@ -18,6 +18,7 @@ ifeq ($(COM),GCC)
$(call gb_ExternalProject_get_state_target,xml2,build): $(call gb_ExternalProject_get_state_target,xml2,build):
$(call gb_ExternalProject_run,build,\ $(call gb_ExternalProject_run,build,\
./configure --disable-ipv6 --without-python --without-zlib \ ./configure --disable-ipv6 --without-python --without-zlib \
--without-lzma \
--disable-static --without-debug lt_cv_cc_dll_switch="-shared" \ --disable-static --without-debug lt_cv_cc_dll_switch="-shared" \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
CC="$(CC) -mthreads $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \ CC="$(CC) -mthreads $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \
...@@ -39,6 +40,7 @@ else # OS!=WNT ...@@ -39,6 +40,7 @@ else # OS!=WNT
$(call gb_ExternalProject_get_state_target,xml2,build): $(call gb_ExternalProject_get_state_target,xml2,build):
$(call gb_ExternalProject_run,build,\ $(call gb_ExternalProject_run,build,\
./configure --disable-ipv6 --without-python --without-zlib --with-sax1 \ ./configure --disable-ipv6 --without-python --without-zlib --with-sax1 \
--without-lzma \
$(if $(debug),--with-run-debug) \ $(if $(debug),--with-run-debug) \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________URELIB) \ $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________URELIB) \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment