From 7665ad4189e871161de94470b752aef222539da5 Mon Sep 17 00:00:00 2001 From: Guillaume BIENKOWSKI Date: Thu, 9 Oct 2014 10:50:39 +0200 Subject: [PATCH] Fix libxml2 generation --- submodules/build/builders.d/libxml2.mk | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/submodules/build/builders.d/libxml2.mk b/submodules/build/builders.d/libxml2.mk index d30c6d369..aa91779f1 100644 --- a/submodules/build/builders.d/libxml2.mk +++ b/submodules/build/builders.d/libxml2.mk @@ -21,9 +21,8 @@ ############################################################################ libxml2_dir?=externals/libxml2 -libxml2_configure_options= \ - --enable-static --disable-shared \ - --disable-rebuild-docs --enable-rebuild-docs=no --with-iconv=no --with-python=no --with-zlib=no +libxml2_configure_options= --enable-static --disable-shared +libxml2_configure_options+= --disable-rebuild-docs --enable-rebuild-docs=no --with-iconv=no --with-python=no --with-zlib=no $(BUILDER_SRC_DIR)/$(libxml2_dir)/patched.stamp: cd $(BUILDER_SRC_DIR)/$(libxml2_dir) \ @@ -41,7 +40,7 @@ $(BUILDER_BUILD_DIR)/$(libxml2_dir)/Makefile: $(BUILDER_SRC_DIR)/$(libxml2_dir)/ mkdir -p $(BUILDER_BUILD_DIR)/$(libxml2_dir) cd $(BUILDER_BUILD_DIR)/$(libxml2_dir) \ && PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \ - $(BUILDER_SRC_DIR)/$(libxml2_dir)/configure -prefix=$(prefix) --host=$(host) ${library_mode} $(libxml2_configure_options) + $(BUILDER_SRC_DIR)/$(libxml2_dir)/configure -prefix=$(prefix) --host=$(host) ${library_mode} ${libxml2_configure_options} build-libxml2: $(BUILDER_BUILD_DIR)/$(libxml2_dir)/Makefile @echo -e "\033[01;32m building libxml2 \033[0m"