[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - RepositoryExternal.mk
David Tardon
dtardon at redhat.com
Mon Jan 25 07:17:58 PST 2016
RepositoryExternal.mk | 8 ++++++++
1 file changed, 8 insertions(+)
New commits:
commit 90d7b7c27f3e68e458504072612b1df697e81136
Author: David Tardon <dtardon at redhat.com>
Date: Wed Jan 13 14:24:31 2016 +0100
allow ext. projects to depend on liblangtag
Change-Id: Ic4219428f3dd15fdf4addccca545d68099e2145f
(cherry picked from commit c2a119baa7817dac64594613b877dc57e03d8e3f)
Reviewed-on: https://gerrit.libreoffice.org/21544
Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>
Tested-by: Fridrich Strba <fridrich at documentfoundation.org>
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 8361961..35417dd 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1060,6 +1060,8 @@ $(call gb_LinkTarget_add_libs,$(1),$(LIBLANGTAG_LIBS))
endef
+gb_ExternalProject__use_liblangtag :=
+
else # !SYSTEM_LIBLANGTAG
$(eval $(call gb_Helper_register_packages_for_install,ooo,\
@@ -1077,11 +1079,17 @@ $(call gb_LinkTarget_use_external_project,$(1),langtag)
endef
+define gb_ExternalProject__use_liblangtag
+$(call gb_ExternalProject_use_external_project,$(1),langtag)
+
+endef
+
endif # SYSTEM_LIBLANGTAG
else
gb_LinkTarget__use_liblangtag :=
+gb_ExternalProject__use_liblangtag :=
endif # ENABLE_LIBLANGTAG
More information about the Libreoffice-commits
mailing list