[Libreoffice-commits] core.git: RepositoryExternal.mk solenv/gbuild

[Michael Stahl]

 RepositoryExternal.mk       |    4 ++++
 solenv/gbuild/LinkTarget.mk |    8 ++++++++
 2 files changed, 12 insertions(+)

New commits:
commit d9162d24ce242f27f9cc0430f0650daac8e5db24
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Jul 29 12:17:03 2015 +0200

    RepositoryExternal.mk: for some reason Mac wants a GeneratedPackage
    
    Change-Id: I5d983fee8d5cd313fbd0d6ece800fa8b80d81b35

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 28acf9c..7c87f5e 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3170,7 +3170,11 @@ endef
 
 define gb_LinkTarget__use_python
 $(call gb_LinkTarget__use_python_headers,$(1))
+ifeq ($(OS),MACOSX)
+$(call gb_LinkTarget_use_generated_package,$(1),python3)
+else
 $(call gb_LinkTarget_use_package,$(1),python3)
+endif
 
 ifeq ($(OS),WNT)
 $(call gb_LinkTarget_add_libs,$(1),\
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 49bd40b..b4b9060 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -1301,6 +1301,14 @@ define gb_LinkTarget_use_packages
 $(foreach package,$(2),$(call gb_LinkTarget_use_package,$(1),$(package)))
 endef
 
+# use a GeneratedPackage, possibly from another module
+# call gb_LinkTarget_use_generated_package,linktarget,package
+define gb_LinkTarget_use_generated_package
+$(call gb_LinkTarget_get_headers_target,$(1)) :| \
+	$(call gb_GeneratedPackage_get_target,$(strip $(2)))
+
+endef
+
 # Use sources from unpacked tarball of an external project
 # call gb_LinkTarget_use_unpacked,linktarget,unpackedtarget
 define gb_LinkTarget_use_unpacked