diff options
| author | Petr Mladek <pmladek@suse.cz> | 2013-03-19 14:38:58 +0100 |
|---|---|---|
| committer | Fridrich Strba <fridrich@documentfoundation.org> | 2013-03-19 13:58:33 +0000 |
| commit | e260bd6d6e341b24dc5094b3657047e5fdb406c6 (patch) | |
| tree | 4a4615e5dd8de3d67dd0703105656518e4c8de6c /solenv | |
| parent | 5a86702e13b3654982f1ee84da981d7fb8c442c5 (diff) | |
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@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/Deliver.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/solenv/gbuild/Deliver.mk b/solenv/gbuild/Deliver.mk index 0f257e5b9814..ab56dabe9113 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)),) |