summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2015-07-29 10:56:57 +0200
committerDavid Tardon <dtardon@redhat.com>2015-08-03 08:25:00 +0000
commit7c706691cfa3501189f94e5fad487e9e29f25c33 (patch)
treecae36e145f70ecf3c191bc9c1827a063dfc566e1
parentf1333692475201ce1be7a037397158051d8bd039 (diff)
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@libreoffice.org> Reviewed-by: David Ostrovsky <david@ostrovsky.org> Reviewed-by: David Tardon <dtardon@redhat.com>
-rw-r--r--RepositoryExternal.mk5
-rw-r--r--solenv/gbuild/LinkTarget.mk8
2 files changed, 13 insertions, 0 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 1d7b09c744af..20de6765d8fb 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 49bd40b39d04..b4b9060e55d8 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