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

[Petr Mladek]

 solenv/gbuild/Deliver.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e260bd6d6e341b24dc5094b3657047e5fdb406c6
Author: Petr Mladek <pmladek at suse.cz>
Date:   Tue Mar 19 14:38:58 2013 +0100

    fix race condition when using hardlinks to deliver into solver
    
    We need to use "touch --no-dereference" on the delivered files.
    Otherwise, it creates empty target file when you touch symlinks and
    delivering the real target file might fail.
    
    This caused many build failures when delivering:
    
        liblcms2.so -> liblcms2.so.2.0.4
        liblcms2.so.2 -> liblcms2.so.2.0.4
        liblcms2.so.2.0.4
    
    Change-Id: Ibd61815c12e002b495e848a125a959b8524b0935
    Reviewed-on: https://gerrit.libreoffice.org/2840
    Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>
    Tested-by: Fridrich Strba <fridrich at documentfoundation.org>

diff --git a/solenv/gbuild/Deliver.mk b/solenv/gbuild/Deliver.mk
index 0f257e5..ab56dab 100644
--- a/solenv/gbuild/Deliver.mk
+++ b/solenv/gbuild/Deliver.mk
@@ -60,7 +60,7 @@ endif
 endef
 
 define gb_Deliver__deliver
-$(if $(gb_Deliver_CLEARONDELIVER),rm -f $(2) &&) $(if $(gb_Deliver_HARDLINK),ln,cp -P -f) $(1) $(2) && touch -r $(1) $(2)
+$(if $(gb_Deliver_CLEARONDELIVER),rm -f $(2) &&) $(if $(gb_Deliver_HARDLINK),ln,cp -P -f) $(1) $(2) && touch --no-dereference -r $(1) $(2)
 endef
 
 ifneq ($(strip $(gb_Deliver_GNUCOPY)),)