[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - RepositoryExternal.mk solenv/gbuild

[Michael Stahl]

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

New commits:
commit 7c706691cfa3501189f94e5fad487e9e29f25c33
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Jul 29 10:56:57 2015 +0200

    RepositoryExternal.mk: missing dependency on python3 package
    
    This was causing all these "libpython3.3m.so: file not recognized: File
    truncated" failures.
    (cherry picked from commit 57dd4d01c1ba036e5da4abf986b8d594d0ccdb95)
    
    RepositoryExternal.mk: for some reason Mac wants a GeneratedPackage
    (cherry picked from commit d9162d24ce242f27f9cc0430f0650daac8e5db24)
    
    Change-Id: I5d983fee8d5cd313fbd0d6ece800fa8b80d81b35
    Reviewed-on: https://gerrit.libreoffice.org/17398
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: David Ostrovsky <david at ostrovsky.org>
    Reviewed-by: David Tardon <dtardon at redhat.com>

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 1d7b09c..20de676 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3170,6 +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