RepositoryExternal.mk | 16 ++++++++++++++++ config_host.mk.in | 2 ++ configure.ac | 9 ++++++++- harfbuzz/ExternalProject_harfbuzz.mk | 6 +----- libcdr/ExternalProject_libcdr.mk | 4 ---- libmspub/ExternalPackage_libmspub.mk | 6 ------ libmspub/ExternalProject_libmspub.mk | 6 ------ libmwaw/ExternalPackage_libmwaw.mk | 6 ------ libvisio/ExternalPackage_libvisio.mk | 6 ------ libvisio/ExternalProject_libvisio.mk | 4 ---- libwpd/ExternalPackage_libwpd.mk | 17 ----------------- 11 files changed, 27 insertions(+), 55 deletions(-)
New commits: commit 5970aad9c63e541071594242037a815da652ca3c Author: Michael Stahl <mst...@redhat.com> Date: Thu May 16 14:10:44 2013 +0200 move copy/pasted ICU_CFLAGS/ICU_LIBS to configure Change-Id: I078cccd57331d40118bcc40fb4eb66b113848caf diff --git a/config_host.mk.in b/config_host.mk.in index 1b7ee43..fa85877 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 cc42d69..49e8d02 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 d0a405f..007e3dd 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 f877cba..7a4a246 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 14013cf..5fb3133 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 3a5ce50..f5116e3 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 \ commit 8505ebd08da214dea6ff35c13bb2fbbfada4d489 Author: Michael Stahl <mst...@redhat.com> Date: Thu May 16 13:31:48 2013 +0200 libmspub: WPD/WPG vars are set by configure.ac already Change-Id: I5d64ecd625821694ec85c5081609cfb777338755 diff --git a/libmspub/ExternalProject_libmspub.mk b/libmspub/ExternalProject_libmspub.mk index 3a0ab0a..14013cf 100644 --- a/libmspub/ExternalProject_libmspub.mk +++ b/libmspub/ExternalProject_libmspub.mk @@ -29,8 +29,6 @@ $(call gb_ExternalProject_get_state_target,libmspub,build) : && 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, )" \ - && export LIBMSPUB_CFLAGS="$(WPG_CFLAGS) $(WPD_CFLAGS)" \ - && export LIBMSPUB_LIBS="$(WPG_LIBS) $(WPD_LIBS)" \ && ./configure \ --with-pic \ --enable-static \ commit db5c8c52ef816bd238bfd458b8d782a73f040ef3 Author: Michael Stahl <mst...@redhat.com> Date: Thu May 16 13:28:14 2013 +0200 libwpd: stop delivering headers Change-Id: Ic9209b5db0990bc9433d82ef95ca64179e888f51 diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 9844a17..d80a22a 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1479,6 +1479,10 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ )) define gb_LinkTarget__use_wpd +$(call gb_LinkTarget_set_include,$(1),\ + $(WPD_CFLAGS) \ + $$(INCLUDE) \ +) $(call gb_LinkTarget_use_package,$(1),\ libwpd \ ) diff --git a/configure.ac b/configure.ac index 565aef9..cc42d69 100644 --- a/configure.ac +++ b/configure.ac @@ -7232,7 +7232,7 @@ libo_CHECK_SYSTEM_MODULE([libcmis],[CMIS],[libcmis-0.3 >= 0.3.1]) dnl =================================================================== dnl Check for system libwpd dnl =================================================================== -libo_CHECK_SYSTEM_MODULE([libwpd],[WPD],[libwpd-0.9 libwpd-stream-0.9],["-I${OUTDIR}/inc/external"],["-L${OUTDIR}/lib -lwpdlib"]) +libo_CHECK_SYSTEM_MODULE([libwpd],[WPD],[libwpd-0.9 libwpd-stream-0.9],["-I${WORKDIR}/UnpackedTarball/libwpd/inc"],["-L${OUTDIR}/lib -lwpdlib"]) dnl =================================================================== dnl Check for system lcms2 diff --git a/libwpd/ExternalPackage_libwpd.mk b/libwpd/ExternalPackage_libwpd.mk index dfab3da..2e7cd09 100644 --- a/libwpd/ExternalPackage_libwpd.mk +++ b/libwpd/ExternalPackage_libwpd.mk @@ -9,23 +9,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,libwpd,libwpd)) -$(eval $(call gb_ExternalPackage_add_unpacked_files,libwpd,inc/external/libwpd,\ - inc/libwpd/libwpd.h \ - inc/libwpd/WPDocument.h \ - inc/libwpd/WPXBinaryData.h \ - inc/libwpd/WPXDocumentInterface.h \ - inc/libwpd/WPXProperty.h \ - inc/libwpd/WPXPropertyList.h \ - inc/libwpd/WPXString.h \ - inc/libwpd/WPXPropertyListVector.h \ -)) - -$(eval $(call gb_ExternalPackage_add_unpacked_files,libwpd,inc/external/libwpd-stream,\ - inc/libwpd-stream/libwpd-stream.h \ - inc/libwpd-stream/WPXStream.h \ - inc/libwpd-stream/WPXStreamImplementation.h \ -)) - $(eval $(call gb_ExternalPackage_use_external_project,libwpd,libwpd)) ifeq ($(OS)$(COM),WNTMSC) commit acc7f61f45ec1a934f409d6f735728f540ea48f4 Author: Michael Stahl <mst...@redhat.com> Date: Thu May 16 13:14:37 2013 +0200 libvisio: stop delivering headers Change-Id: I94d15fc2e367a2fe474cd4e10109bef0d9029b28 diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 6f2c5f6..9844a17 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1444,6 +1444,10 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ )) define gb_LinkTarget__use_visio +$(call gb_LinkTarget_set_include,$(1),\ + -I$(call gb_UnpackedTarball_get_dir,libvisio)/inc \ + $$(INCLUDE) \ +) $(call gb_LinkTarget_use_package,$(1),\ libvisio \ ) diff --git a/libvisio/ExternalPackage_libvisio.mk b/libvisio/ExternalPackage_libvisio.mk index 4baa0a4..1f2a68c 100644 --- a/libvisio/ExternalPackage_libvisio.mk +++ b/libvisio/ExternalPackage_libvisio.mk @@ -9,12 +9,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,libvisio,libvisio)) -$(eval $(call gb_ExternalPackage_add_unpacked_files,libvisio,inc/external/libvisio,\ - inc/libvisio/libvisio.h \ - inc/libvisio/VisioDocument.h \ - inc/libvisio/VSDStringVector.h \ -)) - $(eval $(call gb_ExternalPackage_use_external_project,libvisio,libvisio)) ifeq ($(COM),MSC) commit ff71895f493fbd91c6f155fdf8a78fd324d86024 Author: Michael Stahl <mst...@redhat.com> Date: Thu May 16 13:11:36 2013 +0200 libmwaw: stop delivering headers Change-Id: Ib58198ad0ec638bd92d0e7d8301709654c93ea54 diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 4a70282..6f2c5f6 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1579,6 +1579,10 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ )) define gb_LinkTarget__use_mwaw +$(call gb_LinkTarget_set_include,$(1),\ + -I$(call gb_UnpackedTarball_get_dir,libmwaw)/inc \ + $$(INCLUDE) \ +) $(call gb_LinkTarget_use_package,$(1),\ libmwaw \ ) diff --git a/libmwaw/ExternalPackage_libmwaw.mk b/libmwaw/ExternalPackage_libmwaw.mk index 6608cb1..578054f 100644 --- a/libmwaw/ExternalPackage_libmwaw.mk +++ b/libmwaw/ExternalPackage_libmwaw.mk @@ -9,12 +9,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,libmwaw,libmwaw)) -$(eval $(call gb_ExternalPackage_add_unpacked_files,libmwaw,inc/external/libmwaw,\ - inc/libmwaw/libmwaw.hxx \ - inc/libmwaw/MWAWDocument.hxx \ - inc/libmwaw/MWAWPropertyHandler.hxx \ -)) - $(eval $(call gb_ExternalPackage_use_external_project,libmwaw,libmwaw)) ifeq ($(OS)$(COM),WNTMSC) commit 35ac39e4bdd34801055e6b7ea013a11c5b408bb0 Author: Michael Stahl <mst...@redhat.com> Date: Thu May 16 13:09:11 2013 +0200 libmspub: stop delivering headers Change-Id: I78d5b83b5d98c1c37b9b95d3504533dabb449e09 diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 1842538..4a70282 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1410,6 +1410,10 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ )) define gb_LinkTarget__use_mspub +$(call gb_LinkTarget_set_include,$(1),\ + -I$(call gb_UnpackedTarball_get_dir,libmspub)/inc \ + $$(INCLUDE) \ +) $(call gb_LinkTarget_use_package,$(1),\ libmspub \ ) diff --git a/libmspub/ExternalPackage_libmspub.mk b/libmspub/ExternalPackage_libmspub.mk index 740c19e..8ecc85d 100644 --- a/libmspub/ExternalPackage_libmspub.mk +++ b/libmspub/ExternalPackage_libmspub.mk @@ -9,12 +9,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,libmspub,libmspub)) -$(eval $(call gb_ExternalPackage_add_unpacked_files,libmspub,inc/external/libmspub,\ - inc/libmspub/libmspub.h \ - inc/libmspub/MSPUBDocument.h \ - inc/libmspub/MSPUBStringVector.h \ -)) - $(eval $(call gb_ExternalPackage_use_external_project,libmspub,libmspub)) ifeq ($(COM),MSC) _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits