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

[David Tardon]

 solenv/gbuild/ExternalProject.mk |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 975a62b4caa5fa1308ef300c549d45f5ffd4c455
Author: David Tardon <dtardon at redhat.com>
Date:   Wed Jun 24 15:08:16 2015 +0200

    restore gb_ExternalProject_use_unpacked, with diff. purpose
    
    Change-Id: I7d7cbe85219615f80069155a954f917781bc5b71
    (cherry picked from commit 3f040ce5ef691c1f93eb788eb67f3de8d772f07a)
    Reviewed-on: https://gerrit.libreoffice.org/16503
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/solenv/gbuild/ExternalProject.mk b/solenv/gbuild/ExternalProject.mk
index 59fc678..92bb7df 100644
--- a/solenv/gbuild/ExternalProject.mk
+++ b/solenv/gbuild/ExternalProject.mk
@@ -86,9 +86,15 @@ $(call gb_Helper_make_userfriendly_targets,$(1),ExternalProject)
 
 endef
 
-# replaced by second parameter to ctor
+# Depend on an unpacked tarball
+#
+# This is needed to express dependencies on header-only projects, which
+# do not have any ExternalProject.
+#
+# gb_ExternalProject_use_unpacked project unpacked
 define gb_ExternalProject_use_unpacked
-$(call gb_Output_error,gb_ExternalProject_use_unpacked was removed)
+$(call gb_ExternalProject_get_preparation_target,$(1)) : $(call gb_UnpackedTarball_get_target,$(2))
+
 endef
 
 # Register a target in state directory