solenv/gbuild/AllLangMoTarget.mk | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
New commits:
commit b54ecbdca64c469e25e46a4c047ee36d355da7c7
Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
AuthorDate: Tue Aug 27 14:04:14 2024 +0200
Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
CommitDate: Thu Nov 28 14:27:25 2024 +0100
run msguniq .. | msgfmt in a subshell to help out wsl1
handling stdout / pipe / redirections seems to be fragile when using
wsl command1 | wsl command2
when multiple of those are run concurrently. So as a workaround make
that a single invocation of
wsl shell -c "command1 | command2"
Change-Id: I9e67fddd6cf377aa0461515036ea7b709714153d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172468
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
Tested-by: Jenkins
(cherry picked from commit 1c84943890afea8eaa8fdaeabbd4394680d657f9)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177437
Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
diff --git a/solenv/gbuild/AllLangMoTarget.mk b/solenv/gbuild/AllLangMoTarget.mk
index ec05985d5ecc..3811ff4ee478 100644
--- a/solenv/gbuild/AllLangMoTarget.mk
+++ b/solenv/gbuild/AllLangMoTarget.mk
@@ -32,12 +32,13 @@ $(call gb_MoTarget_get_clean_target,%) :
$(call gb_MoTarget_get_target,$*) \
$(call gb_MoTarget_get_install_target,$*))
+# wsl1 seems to have issues with writing to stdout/pipes when running with
high parallelism
+# so as a workaround run the two statements in a single command run by a shell
$(call gb_MoTarget_get_target,%) : $(gb_Helper_MISCDUMMY)
$(call gb_Output_announce,$*,$(true),MO ,2)
$(call gb_Trace_StartRange,$*,MO )
- $(call gb_Helper_abbreviate_dirs,\
- mkdir -p $(dir $@) && \
- $(MSGUNIQ) --force-po
$(gb_POLOCATION)/$(LANGUAGE)/$(POLOCATION)/messages.po | $(MSGFMT) - -o $@)
+ $(call gb_Helper_abbreviate_dirs,mkdir -p $(dir $@)) && \
+ $(call gb_Helper_wsl_path,$(WSL) /bin/sh -c "$(MSGUNIQ) --force-po
$(gb_POLOCATION)/$(LANGUAGE)/$(POLOCATION)/messages.po | $(MSGFMT) - -o $@")
$(call gb_Trace_EndRange,$*,MO )
#$(info $(call gb_MoTarget_get_target,$(1)))
