diff options
| -rw-r--r-- | config_host.mk.in | 2 | ||||
| -rw-r--r-- | configure.ac | 7 | ||||
| -rw-r--r-- | harfbuzz/ExternalProject_harfbuzz.mk | 6 | ||||
| -rw-r--r-- | libcdr/ExternalProject_libcdr.mk | 4 | ||||
| -rw-r--r-- | libmspub/ExternalProject_libmspub.mk | 4 | ||||
| -rw-r--r-- | libvisio/ExternalProject_libvisio.mk | 4 |
6 files changed, 10 insertions, 17 deletions
diff --git a/config_host.mk.in b/config_host.mk.in index 1b7ee43f32d2..fa858770ef3e 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -236,6 +236,8 @@ export HUNSPELL_LIBS=$(gb_SPACE)@HUNSPELL_LIBS@ export HYPHEN_LIB=$(gb_SPACE)@HYPHEN_LIB@ export HYPH_SYSTEM_DIR=@HYPH_SYSTEM_DIR@ export ICECREAM_RUN=@ICECREAM_RUN@ +export ICU_CFLAGS=$(gb_SPACE)@ICU_CFLAGS@ +export ICU_LIBS=$(gb_SPACE)@ICU_LIBS@ export ICU_MAJOR=@ICU_MAJOR@ export ICU_MINOR=@ICU_MINOR@ export ICU_RECLASSIFIED_CLOSE_PARENTHESIS=@ICU_RECLASSIFIED_CLOSE_PARENTHESIS@ diff --git a/configure.ac b/configure.ac index cc42d699e92d..49e8d025931c 100644 --- a/configure.ac +++ b/configure.ac @@ -8395,6 +8395,11 @@ else AC_MSG_RESULT([internal]) SYSTEM_ICU="NO" BUILD_TYPE="$BUILD_TYPE ICU" + # surprisingly set these only for "internal" (to be used by various other + # external libs): the system icu-config is quite unhelpful and spits out + # dozens of weird flags and also default path -I/usr/include + ICU_CFLAGS="-I${WORKDIR}/UnpackedTarball/icu/source/i18n -I${WORKDIR}/UnpackedTarball/icu/source/common" + ICU_LIBS="" fi AC_SUBST(SYSTEM_ICU) AC_SUBST(SYSTEM_GENBRK) @@ -8406,6 +8411,8 @@ AC_SUBST(ICU_RECLASSIFIED_CLOSE_PARENTHESIS) AC_SUBST(ICU_RECLASSIFIED_PREPEND_SET_EMPTY) AC_SUBST(ICU_RECLASSIFIED_CONDITIONAL_JAPANESE_STARTER) AC_SUBST(ICU_RECLASSIFIED_HEBREW_LETTER) +AC_SUBST(ICU_CFLAGS) +AC_SUBST(ICU_LIBS) dnl =================================================================== dnl Graphite diff --git a/harfbuzz/ExternalProject_harfbuzz.mk b/harfbuzz/ExternalProject_harfbuzz.mk index d0a405fbc35c..007e3dd0fc59 100644 --- a/harfbuzz/ExternalProject_harfbuzz.mk +++ b/harfbuzz/ExternalProject_harfbuzz.mk @@ -21,11 +21,7 @@ $(eval $(call gb_ExternalProject_use_externals,harfbuzz,\ $(call gb_ExternalProject_get_state_target,harfbuzz,build) : $(call gb_ExternalProject_run,build,\ - export ICU_LIBS=" " \ - && export ICU_CFLAGS="$(if $(filter NO,$(SYSTEM_ICU)),\ - -I$(call gb_UnpackedTarball_get_dir,icu)/source/i18n \ - -I$(call gb_UnpackedTarball_get_dir,icu)/source/common, )" \ - && ./configure \ + ./configure \ --enable-static \ --disable-shared \ --with-pic \ diff --git a/libcdr/ExternalProject_libcdr.mk b/libcdr/ExternalProject_libcdr.mk index f877cba7fd37..7a4a2465903f 100644 --- a/libcdr/ExternalProject_libcdr.mk +++ b/libcdr/ExternalProject_libcdr.mk @@ -27,10 +27,6 @@ $(eval $(call gb_ExternalProject_use_externals,libcdr,\ $(call gb_ExternalProject_get_state_target,libcdr,build) : $(call gb_ExternalProject_run,build,\ export PKG_CONFIG="" \ - && export ICU_LIBS=" " \ - && export ICU_CFLAGS="$(if $(filter NO,$(SYSTEM_ICU)),\ - -I$(call gb_UnpackedTarball_get_dir,icu)/source/i18n \ - -I$(call gb_UnpackedTarball_get_dir,icu)/source/common, )" \ && ./configure \ --with-pic \ --enable-static \ diff --git a/libmspub/ExternalProject_libmspub.mk b/libmspub/ExternalProject_libmspub.mk index 14013cfb4408..5fb3133e235e 100644 --- a/libmspub/ExternalProject_libmspub.mk +++ b/libmspub/ExternalProject_libmspub.mk @@ -25,10 +25,6 @@ $(eval $(call gb_ExternalProject_use_externals,libmspub,\ $(call gb_ExternalProject_get_state_target,libmspub,build) : $(call gb_ExternalProject_run,build,\ export PKG_CONFIG="" \ - && export ICU_LIBS=" " \ - && export ICU_CFLAGS="$(if $(filter NO,$(SYSTEM_ICU)),\ - -I$(call gb_UnpackedTarball_get_dir,icu)/source/i18n \ - -I$(call gb_UnpackedTarball_get_dir,icu)/source/common, )" \ && ./configure \ --with-pic \ --enable-static \ diff --git a/libvisio/ExternalProject_libvisio.mk b/libvisio/ExternalProject_libvisio.mk index 3a5ce50cfa5d..f5116e3c54da 100644 --- a/libvisio/ExternalProject_libvisio.mk +++ b/libvisio/ExternalProject_libvisio.mk @@ -27,10 +27,6 @@ $(eval $(call gb_ExternalProject_use_externals,libvisio,\ $(call gb_ExternalProject_get_state_target,libvisio,build) : $(call gb_ExternalProject_run,build,\ export PKG_CONFIG="" \ - && export ICU_LIBS=" " \ - && export ICU_CFLAGS="$(if $(filter NO,$(SYSTEM_ICU)),\ - -I$(call gb_UnpackedTarball_get_dir,icu)/source/i18n \ - -I$(call gb_UnpackedTarball_get_dir,icu)/source/common, )" \ && ./configure \ --with-pic \ --enable-static \ |