diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-07-29 10:56:57 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-08-03 16:13:59 +0000 |
| commit | f8176e86ccdd7c0b2fa8bc059872e0bcd8bec401 (patch) | |
| tree | 5bb056b5398cd067d5c3c54ae0124683cd9e9d21 /solenv | |
| parent | 57e6d5e978e0a70aa036f19bd3328a71dd3a587f (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: Ib814ab4fa43d9c8f20cf9b16ad04e1a71057e595
Reviewed-on: https://gerrit.libreoffice.org/17396
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/LinkTarget.mk | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index f9cfab7cc0cd..333c6c88e85f 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -1313,6 +1313,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 |