(openoffice) branch AOO41X updated: icu module parallel build fix

[truckman]

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

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


The following commit(s) were added to refs/heads/AOO41X by this push:
     new 6f5282da15 icu module parallel build fix
6f5282da15 is described below

commit 6f5282da155025990430a072183066a195e7c907
Author: Don Lewis <truck...@apache.org>
AuthorDate: Mon Jan 12 00:52:44 2026 -0800

    icu module parallel build fix
    
    Parallel builds of the icu module fail sporadically due to a race
    condition.  Tweak the makefile dependencies to hopefully fix the
    problem.
    
    (cherry picked from commit 17604d2661ceca2ca6d152a1fcedd0802bbab260)
    (cherry picked from commit 93c12e13f9b97dbabaad3213770342fcb98d0136)
---
 main/icu/icu-parallel-build.patch | 20 ++++++++++++++++++++
 main/icu/makefile.mk              |  1 +
 2 files changed, 21 insertions(+)

diff --git a/main/icu/icu-parallel-build.patch 
b/main/icu/icu-parallel-build.patch
new file mode 100644
index 0000000000..99915b7d58
--- /dev/null
+++ b/main/icu/icu-parallel-build.patch
@@ -0,0 +1,20 @@
+diff -ur misc/icu/source/extra/uconv/Makefile.in 
misc/build/icu/source/extra/uconv/Makefile.in
+--- misc/icu/source/extra/uconv/Makefile.in    2009-07-01 11:50:32.000000000 
-0700
++++ misc/build/icu/source/extra/uconv/Makefile.in
+@@ -140,14 +140,14 @@
+       $(LINK.cc) $(OUTOPT)$@ $(OBJECTS) $(LIBS)
+       $(POST_BUILD_STEP)
+ 
+-resfiles: $(RESFILES) package-resfiles
++resfiles: package-resfiles
+ 
+ ifeq ($(UCONVMSG_STATIC),YES)
+ $(UCONVMSG_LIB): resfiles
+ endif
+ 
+ 
+-package-resfiles: $(RESDIR)/$(RESDIR).lst pkgdata.inc
++package-resfiles: $(RESFILES) $(RESDIR)/$(RESDIR).lst pkgdata.inc $(RESFILES)
+       $(INVOKE) $(PKGDATA_INVOKE_OPTS) $(TOOLBINDIR)/pkgdata -p $(MSGNAME) 
$(PKGDATA_OPTS) -m $(PKGMODE) -s $(RESDIR) -d $(RESDIR) -T $(RESDIR) 
$(RESDIR)/$(RESDIR).lst
+ 
+ $(RESDIR)/$(RESDIR).lst: Makefile $(srcdir)/resfiles.mk
diff --git a/main/icu/makefile.mk b/main/icu/makefile.mk
index d136e4989c..5d099863b9 100644
--- a/main/icu/makefile.mk
+++ b/main/icu/makefile.mk
@@ -44,6 +44,7 @@ TARFILE_ROOTDIR=icu
 
 # TODO file icu-mp.patch does not seem to be required
 PATCH_FILES=${TARFILE_NAME}.patch icu-win-layout.patch \
+       icu-parallel-build.patch \
        icu-format-security.patch icu-win-icutu-dll-version.patch
 .IF "$(OS)"=="MACOSX"
 PATCH_FILES+=icu-darwin.patch