diff options
| author | Peter Foley <pefoley2@verizon.net> | 2013-02-05 17:19:11 -0500 |
|---|---|---|
| committer | Peter Foley <pefoley2@verizon.net> | 2013-02-07 22:33:16 +0000 |
| commit | b9d6c7a48cbe3573a2010811d8671d3e5ff30e2a (patch) | |
| tree | b08989fd5eeb63691f914e8b393d80151588c0f7 /liblangtag | |
| parent | 7e2f34a3172a756a0fd70cae1294250206945a6e (diff) | |
convert libxml2 to gbuild and add to tail_build
Change-Id: Ie6ae2150e1f011e17034abcace18c5967b4dacf5
Reviewed-on: https://gerrit.libreoffice.org/2023
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Peter Foley <pefoley2@verizon.net>
Diffstat (limited to 'liblangtag')
| -rw-r--r-- | liblangtag/ExternalProject_langtag.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/liblangtag/ExternalProject_langtag.mk b/liblangtag/ExternalProject_langtag.mk index ca2a6502e7f3..81ec9a21d728 100644 --- a/liblangtag/ExternalProject_langtag.mk +++ b/liblangtag/ExternalProject_langtag.mk @@ -10,6 +10,7 @@ $(eval $(call gb_ExternalProject_ExternalProject,langtag)) $(eval $(call gb_ExternalProject_use_unpacked,langtag,langtag)) +$(eval $(call gb_ExternalProject_use_external,langtag,libxml2)) $(eval $(call gb_ExternalProject_register_targets,langtag,\ build \ @@ -25,7 +26,7 @@ $(call gb_ExternalProject_get_state_target,langtag,build): && ./configure --disable-modules --disable-test --disable-introspection --disable-shared --enable-static --with-pic \ $(if $(filter TRUE,$(HAVE_GCC_BUILTIN_ATOMIC)),"lt_cv_has_atomic=yes","lt_cv_has_atomic=no") \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ - $(if $(filter NO,$(SYSTEM_LIBXML)),LIBXML2_CFLAGS="-I$(OUTDIR)/inc/external" \ + $(if $(filter NO,$(SYSTEM_LIBXML)),LIBXML2_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,xml2)/include" \ $(if $(filter MSC,$(COM)),LIBXML2_LIBS="$(OUTDIR)/lib/libxml2.lib",LIBXML2_LIBS="-L$(OUTDIR)/lib -lxml2"),\ $(if $(filter MACOSX,$(OS)),LIBXML2_CFLAGS="$(LIBXML_CFLAGS)" LIBXML2_LIBS="$(LIBXML_LIBS)")) \ $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \ |