Kaydet (Commit) 5970aad9 authored tarafından Michael Stahl's avatar Michael Stahl

move copy/pasted ICU_CFLAGS/ICU_LIBS to configure

Change-Id: I078cccd57331d40118bcc40fb4eb66b113848caf
üst 8505ebd0
...@@ -236,6 +236,8 @@ export HUNSPELL_LIBS=$(gb_SPACE)@HUNSPELL_LIBS@ ...@@ -236,6 +236,8 @@ export HUNSPELL_LIBS=$(gb_SPACE)@HUNSPELL_LIBS@
export HYPHEN_LIB=$(gb_SPACE)@HYPHEN_LIB@ export HYPHEN_LIB=$(gb_SPACE)@HYPHEN_LIB@
export HYPH_SYSTEM_DIR=@HYPH_SYSTEM_DIR@ export HYPH_SYSTEM_DIR=@HYPH_SYSTEM_DIR@
export ICECREAM_RUN=@ICECREAM_RUN@ 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_MAJOR=@ICU_MAJOR@
export ICU_MINOR=@ICU_MINOR@ export ICU_MINOR=@ICU_MINOR@
export ICU_RECLASSIFIED_CLOSE_PARENTHESIS=@ICU_RECLASSIFIED_CLOSE_PARENTHESIS@ export ICU_RECLASSIFIED_CLOSE_PARENTHESIS=@ICU_RECLASSIFIED_CLOSE_PARENTHESIS@
......
...@@ -8395,6 +8395,11 @@ else ...@@ -8395,6 +8395,11 @@ else
AC_MSG_RESULT([internal]) AC_MSG_RESULT([internal])
SYSTEM_ICU="NO" SYSTEM_ICU="NO"
BUILD_TYPE="$BUILD_TYPE ICU" 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 fi
AC_SUBST(SYSTEM_ICU) AC_SUBST(SYSTEM_ICU)
AC_SUBST(SYSTEM_GENBRK) AC_SUBST(SYSTEM_GENBRK)
...@@ -8406,6 +8411,8 @@ AC_SUBST(ICU_RECLASSIFIED_CLOSE_PARENTHESIS) ...@@ -8406,6 +8411,8 @@ AC_SUBST(ICU_RECLASSIFIED_CLOSE_PARENTHESIS)
AC_SUBST(ICU_RECLASSIFIED_PREPEND_SET_EMPTY) AC_SUBST(ICU_RECLASSIFIED_PREPEND_SET_EMPTY)
AC_SUBST(ICU_RECLASSIFIED_CONDITIONAL_JAPANESE_STARTER) AC_SUBST(ICU_RECLASSIFIED_CONDITIONAL_JAPANESE_STARTER)
AC_SUBST(ICU_RECLASSIFIED_HEBREW_LETTER) AC_SUBST(ICU_RECLASSIFIED_HEBREW_LETTER)
AC_SUBST(ICU_CFLAGS)
AC_SUBST(ICU_LIBS)
dnl =================================================================== dnl ===================================================================
dnl Graphite dnl Graphite
......
...@@ -21,11 +21,7 @@ $(eval $(call gb_ExternalProject_use_externals,harfbuzz,\ ...@@ -21,11 +21,7 @@ $(eval $(call gb_ExternalProject_use_externals,harfbuzz,\
$(call gb_ExternalProject_get_state_target,harfbuzz,build) : $(call gb_ExternalProject_get_state_target,harfbuzz,build) :
$(call gb_ExternalProject_run,build,\ $(call gb_ExternalProject_run,build,\
export ICU_LIBS=" " \ ./configure \
&& 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 \
--enable-static \ --enable-static \
--disable-shared \ --disable-shared \
--with-pic \ --with-pic \
......
...@@ -27,10 +27,6 @@ $(eval $(call gb_ExternalProject_use_externals,libcdr,\ ...@@ -27,10 +27,6 @@ $(eval $(call gb_ExternalProject_use_externals,libcdr,\
$(call gb_ExternalProject_get_state_target,libcdr,build) : $(call gb_ExternalProject_get_state_target,libcdr,build) :
$(call gb_ExternalProject_run,build,\ $(call gb_ExternalProject_run,build,\
export PKG_CONFIG="" \ 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 \ && ./configure \
--with-pic \ --with-pic \
--enable-static \ --enable-static \
......
...@@ -25,10 +25,6 @@ $(eval $(call gb_ExternalProject_use_externals,libmspub,\ ...@@ -25,10 +25,6 @@ $(eval $(call gb_ExternalProject_use_externals,libmspub,\
$(call gb_ExternalProject_get_state_target,libmspub,build) : $(call gb_ExternalProject_get_state_target,libmspub,build) :
$(call gb_ExternalProject_run,build,\ $(call gb_ExternalProject_run,build,\
export PKG_CONFIG="" \ 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 \ && ./configure \
--with-pic \ --with-pic \
--enable-static \ --enable-static \
......
...@@ -27,10 +27,6 @@ $(eval $(call gb_ExternalProject_use_externals,libvisio,\ ...@@ -27,10 +27,6 @@ $(eval $(call gb_ExternalProject_use_externals,libvisio,\
$(call gb_ExternalProject_get_state_target,libvisio,build) : $(call gb_ExternalProject_get_state_target,libvisio,build) :
$(call gb_ExternalProject_run,build,\ $(call gb_ExternalProject_run,build,\
export PKG_CONFIG="" \ 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 \ && ./configure \
--with-pic \ --with-pic \
--enable-static \ --enable-static \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment