diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-02-11 16:49:19 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-02-12 09:53:09 +0100 |
| commit | 379f978387a8b017a41c2682c0b39444f17a2230 (patch) | |
| tree | 4329e3a1b12516f8db66389e90125ee43c1ab0a0 /external/liblangtag | |
| parent | normalize values of SYSTEM_CLUCENE, SYSTEM_EXPAT, SYSTEM_JPEG (diff) | |
| download | core-379f978387a8b017a41c2682c0b39444f17a2230.tar.gz core-379f978387a8b017a41c2682c0b39444f17a2230.zip | |
normalize values of SYSTEM_FREETYPE, SYSTEM_LIBXML, SYSTEM_MARIADB
Change-Id: Iffcc671ca41c5880579effe0786a3b4d3be0dab0
Diffstat (limited to 'external/liblangtag')
| -rw-r--r-- | external/liblangtag/ExternalProject_langtag.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/external/liblangtag/ExternalProject_langtag.mk b/external/liblangtag/ExternalProject_langtag.mk index b4f17ced3e13..17708155bb10 100644 --- a/external/liblangtag/ExternalProject_langtag.mk +++ b/external/liblangtag/ExternalProject_langtag.mk @@ -26,10 +26,10 @@ $(call gb_ExternalProject_get_state_target,langtag,build): $(if $(filter WNTMSC,$(OS)$(COM)),--disable-rebuild-data) \ $(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) "ac_cv_va_copy=no") \ - $(if $(filter NO,$(SYSTEM_LIBXML)),\ + $(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"),\ - $(if $(filter MACOSX,$(OS)),LIBXML2_CFLAGS="$(LIBXML_CFLAGS)" LIBXML2_LIBS="$(LIBXML_LIBS)")) \ + 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")) \ $(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) \ |