This is an automated email from the ASF dual-hosted git repository. damjan pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit fe8b5eb68f13e058f9e43fd95f49fec61d24fed7 Author: Damjan Jovanovic <[email protected]> AuthorDate: Wed Jan 1 05:33:05 2025 +0200 The "OutputDirectory" in the upstream ICU's *.vcproj files for Windows/x64 is often buggy, breaking the build. Use the Windows/x86 OutputDirectory value instead, when they differ. For future reference, it is possible to check for this inconsistency, by examining the output of this command run in the icu/source directory: find . -name '*.vcproj' | while read i; do echo $i; grep 'OutputDirectory' $i; done Patch by: me --- main/icu/icu-vcproj-outputdirectory.patch | 147 ++++++++++++++++++++++++++++++ main/icu/makefile.mk | 3 +- 2 files changed, 149 insertions(+), 1 deletion(-) diff --git a/main/icu/icu-vcproj-outputdirectory.patch b/main/icu/icu-vcproj-outputdirectory.patch new file mode 100644 index 0000000000..51cbc23799 --- /dev/null +++ b/main/icu/icu-vcproj-outputdirectory.patch @@ -0,0 +1,147 @@ +diff -Nur misc/build/icu/source/common/common.vcproj misc/build/icu/source/common/common.vcproj +--- misc/build/icu/source/common/common.vcproj 2025-01-01 05:17:57.155933000 +0200 ++++ misc/build/icu/source/common/common.vcproj 2025-01-01 05:19:04.152887000 +0200 +@@ -203,7 +203,7 @@ + </Configuration> + <Configuration + Name="Release|x64" +- OutputDirectory=".\x64\Release" ++ OutputDirectory=".\..\..\lib" + IntermediateDirectory=".\x64\Release" + ConfigurationType="2" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" +@@ -295,7 +295,7 @@ + </Configuration> + <Configuration + Name="Debug|x64" +- OutputDirectory=".\x64\Debug" ++ OutputDirectory=".\..\..\lib" + IntermediateDirectory=".\x64\Debug" + ConfigurationType="2" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" +diff -Nur misc/build/icu/source/i18n/i18n.vcproj misc/build/icu/source/i18n/i18n.vcproj +--- misc/build/icu/source/i18n/i18n.vcproj 2025-01-01 05:17:51.273387000 +0200 ++++ misc/build/icu/source/i18n/i18n.vcproj 2025-01-01 05:24:12.394293000 +0200 +@@ -209,7 +209,7 @@ + </Configuration> + <Configuration + Name="Release|x64" +- OutputDirectory=".\x64\Release" ++ OutputDirectory=".\..\..\lib" + IntermediateDirectory=".\x64\Release" + ConfigurationType="2" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" +@@ -301,7 +301,7 @@ + </Configuration> + <Configuration + Name="Debug|x64" +- OutputDirectory=".\x64\Debug" ++ OutputDirectory=".\..\..\lib" + IntermediateDirectory=".\x64\Debug" + ConfigurationType="2" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" +diff -Nur misc/build/icu/source/io/io.vcproj misc/build/icu/source/io/io.vcproj +--- misc/build/icu/source/io/io.vcproj 2025-01-01 05:18:06.743249000 +0200 ++++ misc/build/icu/source/io/io.vcproj 2025-01-01 05:20:39.777087000 +0200 +@@ -209,7 +209,7 @@ + </Configuration> + <Configuration + Name="Release|x64" +- OutputDirectory=".\x64\Release" ++ OutputDirectory=".\..\..\lib" + IntermediateDirectory=".\x64\Release" + ConfigurationType="2" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" +@@ -304,7 +304,7 @@ + </Configuration> + <Configuration + Name="Debug|x64" +- OutputDirectory=".\x64\Debug" ++ OutputDirectory=".\..\..\lib" + IntermediateDirectory=".\x64\Debug" + ConfigurationType="2" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" +diff -Nur misc/build/icu/source/layout/layout.vcproj misc/build/icu/source/layout/layout.vcproj +--- misc/build/icu/source/layout/layout.vcproj 2025-01-01 05:18:01.898212000 +0200 ++++ misc/build/icu/source/layout/layout.vcproj 2025-01-01 05:21:22.121321000 +0200 +@@ -209,7 +209,7 @@ + </Configuration> + <Configuration + Name="Debug|x64" +- OutputDirectory=".\x64\Debug" ++ OutputDirectory=".\..\..\lib" + IntermediateDirectory=".\x64\Debug" + ConfigurationType="2" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" +@@ -308,7 +308,7 @@ + </Configuration> + <Configuration + Name="Release|x64" +- OutputDirectory=".\x64\Release" ++ OutputDirectory=".\..\..\lib" + IntermediateDirectory=".\x64\Release" + ConfigurationType="2" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" +diff -Nur misc/build/icu/source/layoutex/layoutex.vcproj misc/build/icu/source/layoutex/layoutex.vcproj +--- misc/build/icu/source/layoutex/layoutex.vcproj 2025-01-01 05:17:53.481075000 +0200 ++++ misc/build/icu/source/layoutex/layoutex.vcproj 2025-01-01 05:23:34.897976000 +0200 +@@ -208,7 +208,7 @@ + </Configuration> + <Configuration + Name="Release|x64" +- OutputDirectory=".\x64\Release" ++ OutputDirectory=".\..\..\lib" + IntermediateDirectory=".\x64\Release" + ConfigurationType="2" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" +@@ -302,7 +302,7 @@ + </Configuration> + <Configuration + Name="Debug|x64" +- OutputDirectory=".\x64\Debug" ++ OutputDirectory=".\..\..\lib" + IntermediateDirectory=".\x64\Debug" + ConfigurationType="2" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" +diff -Nur misc/build/icu/source/tools/ctestfw/ctestfw.vcproj misc/build/icu/source/tools/ctestfw/ctestfw.vcproj +--- misc/build/icu/source/tools/ctestfw/ctestfw.vcproj 2025-01-01 05:18:03.176621000 +0200 ++++ misc/build/icu/source/tools/ctestfw/ctestfw.vcproj 2025-01-01 05:22:55.393701000 +0200 +@@ -207,7 +207,7 @@ + </Configuration> + <Configuration + Name="Release|x64" +- OutputDirectory=".\x64\Release" ++ OutputDirectory=".\..\..\..\lib" + IntermediateDirectory=".\x64\Release" + ConfigurationType="2" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" +@@ -302,7 +302,7 @@ + </Configuration> + <Configuration + Name="Debug|x64" +- OutputDirectory=".\x64\Debug" ++ OutputDirectory=".\..\..\..\lib" + IntermediateDirectory=".\x64\Debug" + ConfigurationType="2" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" +diff -Nur misc/build/icu/source/tools/toolutil/toolutil.vcproj misc/build/icu/source/tools/toolutil/toolutil.vcproj +--- misc/build/icu/source/tools/toolutil/toolutil.vcproj 2025-01-01 05:18:03.684971000 +0200 ++++ misc/build/icu/source/tools/toolutil/toolutil.vcproj 2025-01-01 05:22:13.713520000 +0200 +@@ -210,7 +210,7 @@ + </Configuration> + <Configuration + Name="Release|x64" +- OutputDirectory=".\x64\Release" ++ OutputDirectory=".\..\..\..\lib" + IntermediateDirectory=".\x64\Release" + ConfigurationType="2" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" +@@ -307,7 +307,7 @@ + </Configuration> + <Configuration + Name="Debug|x64" +- OutputDirectory=".\x64\Debug" ++ OutputDirectory=".\..\..\..\lib" + IntermediateDirectory=".\x64\Debug" + ConfigurationType="2" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" diff --git a/main/icu/makefile.mk b/main/icu/makefile.mk index 0b33d01299..57df2309e7 100644 --- a/main/icu/makefile.mk +++ b/main/icu/makefile.mk @@ -44,7 +44,8 @@ TARFILE_ROOTDIR=icu # TODO file icu-mp.patch does not seem to be required PATCH_FILES=${TARFILE_NAME}.patch icu-win-layout.patch \ - icu-format-security.patch icu-win-icutu-dll-version.patch + icu-format-security.patch icu-win-icutu-dll-version.patch \ + icu-vcproj-outputdirectory.patch .IF "$(OS)"=="MACOSX" PATCH_FILES+=icu-darwin.patch
