RepositoryExternal.mk | 6 ++++++ external/harfbuzz/ExternalProject_harfbuzz.mk | 1 + 2 files changed, 7 insertions(+)
New commits: commit 01f8478a154e0717e0fcac3d9cc9c648d02b492f Author: Khaled Hosny <[email protected]> Date: Fri Sep 23 18:34:09 2016 +0200 Make sure HarfBuzz module depends on Graphite Change-Id: I9c1cc9c679ceebeb4e5cd898876aaa7b61c18f17 diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 64eeacf..c818136 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1368,6 +1368,8 @@ $(call gb_LinkTarget_add_libs,$(1),$(GRAPHITE_LIBS)) endef +gb_ExternalProject__use_graphite:= + else # !SYSTEM_GRAPHITE define gb_LinkTarget__use_graphite @@ -1382,6 +1384,10 @@ $(call gb_LinkTarget_use_static_libraries,$(1),\ endef +define gb_ExternalProject__use_graphite +$(call gb_ExternalProject_use_external_project,$(1),graphite) + +endef endif # SYSTEM_GRAPHITE ifneq ($(SYSTEM_ICU),) diff --git a/external/harfbuzz/ExternalProject_harfbuzz.mk b/external/harfbuzz/ExternalProject_harfbuzz.mk index d733a5d..3c79c73 100644 --- a/external/harfbuzz/ExternalProject_harfbuzz.mk +++ b/external/harfbuzz/ExternalProject_harfbuzz.mk @@ -17,6 +17,7 @@ $(eval $(call gb_ExternalProject_register_targets,harfbuzz,\ $(eval $(call gb_ExternalProject_use_externals,harfbuzz,\ icu \ + graphite \ )) $(call gb_ExternalProject_get_state_target,harfbuzz,build) : _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
