diff options
| author | David Tardon <dtardon@redhat.com> | 2014-07-17 17:27:05 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2014-07-20 10:15:25 +0200 |
| commit | 7515b1a90fac9e31733c0fdcc1156adadf0e6f99 (patch) | |
| tree | 442bc11d06390d5ba90c773def726164b31eaa0d /external/liblangtag | |
| parent | Fix OpenGL chart reinitializing (diff) | |
| download | core-7515b1a90fac9e31733c0fdcc1156adadf0e6f99.tar.gz core-7515b1a90fac9e31733c0fdcc1156adadf0e6f99.zip | |
fdo#63756 build libxml2 with ICU support
Change-Id: I0523e49e640812be435ba4c97b1881ca253eb2ab
Diffstat (limited to 'external/liblangtag')
| -rw-r--r-- | external/liblangtag/ExternalProject_langtag.mk | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/external/liblangtag/ExternalProject_langtag.mk b/external/liblangtag/ExternalProject_langtag.mk index 33a7bf26bdcf..c3d411509cc3 100644 --- a/external/liblangtag/ExternalProject_langtag.mk +++ b/external/liblangtag/ExternalProject_langtag.mk @@ -25,10 +25,8 @@ $(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 $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) "ac_cv_va_copy=no") \ - $(if $(SYSTEM_LIBXML),\ - $(if $(filter MACOSX,$(OS)),LIBXML2_CFLAGS="$(LIBXML_CFLAGS)" LIBXML2_LIBS="$(LIBXML_LIBS)"), \ - LIBXML2_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,xml2)/include" \ - LIBXML2_LIBS=$(if $(filter WNTMSC,$(OS)$(COM)),"-L$(call gb_UnpackedTarball_get_dir,xml2)/win32/bin.msvc -llibxml2","-L$(call gb_UnpackedTarball_get_dir,xml2)/.libs -lxml2")) \ + LIBXML2_CFLAGS="$(LIBXML_CFLAGS)" \ + LIBXML2_LIBS="$(if $(filter WNTMSC,$(OS)$(COM)),-L$(call gb_UnpackedTarball_get_dir,xml2)/win32/bin.msvc -llibxml2,$(LIBXML_LIBS))" \ $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \ $(if $(filter-out LINUX FREEBSD,$(OS)),,LDFLAGS="-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath,\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib) \ $(if $(filter-out SOLARIS,$(OS)),,LDFLAGS="-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-R$(COMMA)\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib) \ |