[Libreoffice-commits] .: RepositoryExternal.mk

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Wed Nov 14 10:03:01 PST 2012


 RepositoryExternal.mk |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 1654a1e71bc66ccfb0f809c7a2eac1522b684cd4
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Wed Nov 14 18:11:30 2012 +0100

    gb_LinkTarget_get_preparation_target is not defined (2nd try)
    
    gb_ExternalProject_use_unpacked has completely different different
    side-effects, so use the manual way/the actually expected part of
    the rule
    
    Change-Id: I35edb19c3e768608bbb70314cac7ca908a426c7c
    Reviewed-on: https://gerrit.libreoffice.org/1067
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 38b1635..7d56e35 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -454,12 +454,12 @@ $(call gb_LinkTarget_use_static_libraries,$(1),\
 endef
 
 define gb_LinkTarget__use_boost_headers
-$(call gb_LinkTarget_get_preparation_target,$(1)) : $(call gb_UnpackedTarball_get_target,boost)
+$(call gb_LinkTarget_use_unpacked,$(1),boost)
 
 endef
 
 define gb_ExternalProject__use_boost_headers
-$(call gb_ExternalProject_get_preparation_target,$(1)) : $(call gb_UnpackedTarball_get_target,boost)
+$(call gb_ExternalProject_get_preparation_target,$(1)) :| $(call gb_UnpackedTarball_get_final_target,boost)
 
 endef
 endif # SYSTEM_BOOST


More information about the Libreoffice-commits mailing list