[Libreoffice-commits] .: RepositoryExternal.mk

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Wed Nov 14 08:37:53 PST 2012


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

New commits:
commit dff0a481db662816b06f8496b30786cee5fc3dd5
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Wed Nov 14 17:32:14 2012 +0100

    gb_LinkTarget_get_preparation_target is not defined
    
    and in turn build breaks because boost headers are not ready.
    use the suggestion by mst and use gb_LinkTarget_use_unpacked instead.
    Also use gb_ExternalProject_use_unpacked for consistency
    
    Change-Id: Ie52ba7cd99ae6622b11f32eca8895ca004b8ae95
    Reviewed-on: https://gerrit.libreoffice.org/1066
    Reviewed-by: Tor Lillqvist <tml at iki.fi>
    Tested-by: Tor Lillqvist <tml at iki.fi>

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 38b1635..bc35717 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_use_unpacked,$(1),boost)
 
 endef
 endif # SYSTEM_BOOST


More information about the Libreoffice-commits mailing list