You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by tr...@apache.org on 2019/09/19 15:26:49 UTC
[openoffice] branch AOO42X updated: Work around a race condition
that can sometimes cause parallel builds to fail.
This is an automated email from the ASF dual-hosted git repository.
truckman pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push:
new d871312 Work around a race condition that can sometimes cause parallel builds to fail.
d871312 is described below
commit d871312c801d4a14cffda182f582796385a6d411
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 \
$@ \