This is an automated email from the ASF dual-hosted git repository.

truckman pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 4a564a0  Work around a race condition that can sometimes cause 
parallel builds to fail.
4a564a0 is described below

commit 4a564a01371800ad58526d6121be3343d9c9383e
Author: Don Lewis <dl-...@catspoiler.org>
AuthorDate: Thu Sep 19 08:16:08 2019 -0700

    Work around a race condition that can sometimes cause parallel builds to 
fail.
    
    In a parallel build, a make rule may try to use a destination
    directory before it has been created by a parallel rule.  Avoid the
    failure by creating the directory in both rules.
---
 main/instsetoo_native/util/makefile.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/main/instsetoo_native/util/makefile.mk 
b/main/instsetoo_native/util/makefile.mk
index 15c956e..c228a85 100644
--- a/main/instsetoo_native/util/makefile.mk
+++ b/main/instsetoo_native/util/makefile.mk
@@ -344,6 +344,7 @@ $(BIN)$/dev$/intro.zip : 
$(SOLARCOMMONPCKDIR)$/openoffice_dev$/intro.zip
 
 # Replace framework/res/*.png with *-dev.png
 $(BIN)$/dev$/images.zip : $(SOLARBINDIR)$/images.zip
+       @-$(MKDIR) $(@:d)
        $(COPY) $< $@
        $(PERL) $(SOLARENV)$/bin/replace_in_zip.pl      \
                $@                              \

Reply via email to