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

[David Tardon]

 RepositoryExternal.mk            |    3 +--
 solenv/gbuild/TargetLocations.mk |    1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ac261bf6dc31a44ff0eabb6dd552ddc934c94ce2
Author: David Tardon <dtardon at redhat.com>
Date:   Thu May 16 13:38:44 2013 +0200

    drop unneeded dep
    
    Change-Id: I9686ef445dde2e2f1e2e88a93ec681251fe3093d

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 5005d11..1842538 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2362,7 +2362,6 @@ else # !SYSTEM_PYTHON
 
 # depend on external project because on MACOSX the Package is disabled...
 define gb_LinkTarget__use_python_headers
-$(call gb_LinkTarget_use_package,$(1),python3)
 $(call gb_LinkTarget_use_external_project,$(1),python3)
 $(call gb_LinkTarget_set_include,$(1),\
 	-I$(call gb_UnpackedTarball_get_dir,python3) \
commit 45a5c26f170b6e6f023c9f0a751b4bc98d36b6a4
Author: David Tardon <dtardon at redhat.com>
Date:   Thu May 16 13:36:24 2013 +0200

    fix dep on python framework on mac
    
    Change-Id: Id80540174ccd141eaf89854da6f80bcc0659b59c

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 042512f..5005d11 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2997,7 +2997,7 @@ ifeq ($(OS),MACOSX)
 $(call gb_ExternalExecutable_set_external,python,$(call gb_UnpackedTarball_get_dir,python3)/python-inst/@__________________________________________________OOO/LibreOfficePython.framework/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/bin/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR))
 # the Zip ensures that internal python has been built (cannot use the Package
 # target, as that is not used on Mac)
-$(call gb_ExternalExecutable_add_dependencies,python,$(call gb_Zip_get_outdir_target_for_build,LibreOfficePython.framework))
+$(call gb_ExternalExecutable_add_dependencies,python,$(call gb_GeneratedPackage_get_target_for_build,python3))
 
 else
 
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index a91e0b4..6246eb3 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -122,6 +122,7 @@ gb_ExternalProject_get_target = $(WORKDIR)/ExternalProject/$(1).done
 gb_Gallery_get_target = $(WORKDIR)/Gallery/$(1).done
 gb_Gallery_get_workdir = $(WORKDIR)/Gallery/$(1)
 gb_GeneratedPackage_get_target = $(WORKDIR)/GeneratedPackage/$(1).filelist
+gb_GeneratedPackage_get_target_for_build = $(WORKDIR_FOR_BUILD)/GeneratedPackage/$(1).filelist
 gb_HelpIndexTarget_get_target = $(WORKDIR)/HelpIndexTarget/$(1).done
 gb_HelpJarTarget_get_target = $(WORKDIR)/HelpJarTarget/$(1).done
 gb_HelpLinkTarget_get_preparation_target = $(WORKDIR)/HelpLinkTarget/$(1).prepare