icu: fix Windows extras build

Based on an upstream patch, with an additional hunk to fix the
debug build. Gets rid of a difference between Windows and other
builds.

Change-Id: I597a5cb429fb3257535d8a2ce1142f5f9f34cebe
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103758
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>

3 files changed, 48 insertions, 4 deletions

diff --git a/external/icu/ExternalProject_icu.mk b/external/icu/ExternalProject_icu.mk
index b9fb3f497971..855534f0a405 100644
--- a/external/icu/ExternalProject_icu.mk
+++ b/external/icu/ExternalProject_icu.mk
@@ -29,8 +29,8 @@ $(call gb_ExternalProject_get_state_target,icu,build) :
 				$(if $(MSVC_USE_DEBUG_RUNTIME),--enable-debug --disable-release) \
 				$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \
 					--with-cross-build=$(WORKDIR_FOR_BUILD)/UnpackedTarball/icu/source \
-				    $(if $(GNUMAKE_WIN_NATIVE),--enable-native-make)) \
-				--disable-extras \
+					$(if $(GNUMAKE_WIN_NATIVE),--enable-native-make) \
+					--disable-tools --disable-extras) \
 		&& $(MAKE) $(if $(CROSS_COMPILING),DATASUBDIR=data) $(if $(verbose),VERBOSE=1) \
 	,source)
 	$(call gb_Trace_EndRange,icu,EXTERNAL)
@@ -73,7 +73,6 @@ $(call gb_ExternalProject_get_state_target,icu,build) :
 		./configure \
 			--disable-layout --disable-samples \
 			$(if $(filter FUZZERS,$(BUILD_TYPE)),--disable-release) \
-			$(if $(CROSS_COMPILING),--disable-tools --disable-extras) \
 			$(if $(filter iOS ANDROID,$(OS)),--disable-dyload) \
 			$(if $(filter ANDROID,$(OS)),--disable-strict ac_cv_c_bigendian=no) \
 			$(if $(filter SOLARIS AIX,$(OS)),--disable-64bit-libs) \
@@ -81,7 +80,8 @@ $(call gb_ExternalProject_get_state_target,icu,build) :
 				--with-data-packaging=static --enable-static --disable-shared --disable-dyload,\
 				--disable-static --enable-shared $(if $(filter ANDROID,$(OS)),--with-library-suffix=lo)) \
 			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)\
-				--with-cross-build=$(WORKDIR_FOR_BUILD)/UnpackedTarball/icu/source) \
+				--with-cross-build=$(WORKDIR_FOR_BUILD)/UnpackedTarball/icu/source \
+				--disable-tools --disable-extras) \
 		&& $(MAKE) $(if $(CROSS_COMPILING),DATASUBDIR=data) $(if $(verbose),VERBOSE=1) \
 		$(if $(filter MACOSX,$(OS)), \
 			&& $(PERL) $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl \
diff --git a/external/icu/UnpackedTarball_icu.mk b/external/icu/UnpackedTarball_icu.mk
index 9638f4fb9b0e..552c578ae6cf 100644
--- a/external/icu/UnpackedTarball_icu.mk
+++ b/external/icu/UnpackedTarball_icu.mk
@@ -40,6 +40,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,icu,\
 	external/icu/Wdeprecated-copy-dtor.patch \
 	external/icu/icu4c-khmerbreakengine.patch.1 \
 	external/icu/strict_ansi.patch \
+	external/icu/icu4c-link-scrptrun.patch.2 \
 	$(if $(CROSS_COMPILING),\
 		$(if $(filter WNT_ARM64,$(OS)_$(CPUNAME)),external/icu/icu4c-win-arm64.patch.1) \
 	)\
diff --git a/external/icu/icu4c-link-scrptrun.patch.2 b/external/icu/icu4c-link-scrptrun.patch.2
new file mode 100644
index 000000000000..8c94361a163c
--- /dev/null
+++ b/external/icu/icu4c-link-scrptrun.patch.2
@@ -0,0 +1,43 @@
+Based on: https://github.com/unicode-org/icu/commit/e3f2c0dd70018d924bf22a9b3f0cbf387316b50b.patch
+
+From e3f2c0dd70018d924bf22a9b3f0cbf387316b50b Mon Sep 17 00:00:00 2001
+From: Paul Smith <paul@mad-scientist.net>
+Date: Wed, 5 Aug 2020 13:18:30 -0400
+Subject: [PATCH] ICU-21217 Windows: Fix link command for extra/scrptrun
+
+---
+ icu4c/source/extra/scrptrun/Makefile.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/icu4c/source/extra/scrptrun/Makefile.in b/icu4c/source/extra/scrptrun/Makefile.in
+index f6e47735631..d951f66a4bd 100644
+--- a/icu4c/source/extra/scrptrun/Makefile.in
++++ b/icu4c/source/extra/scrptrun/Makefile.in
+@@ -12,9 +12,6 @@
+ 
+ include $(top_builddir)/icudefs.mk
+ 
+-## Platform-specific setup
+-include @platform_make_fragment@
+-
+ ## Build directory information
+ subdir = extra/scrptrun
+ 
+@@ -33,7 +33,7 @@ ifeq ($(ENABLE_RPATH),YES)
+ RPATHLDFLAGS = $(LD_RPATH)$(LD_RPATH_PRE)$(libdir)
+ endif
+ LDFLAGS = @LDFLAGS@ $(RPATHLDFLAGS)
+-LIBS = $(LIBICUUC) @LIBS@ @LIB_M@
++LIBS = $(LIBICUUC) $(LIB_M)
+ 
+ OBJECTS = scrptrun.o srtest.o
+
+@@ -75,7 +75,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+ 	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+ 
+ $(TARGET) : $(OBJECTS)
+-	$(LINK.cc) -o $@ $^ $(LIBS)
++	$(LINK.cc) $(OUTOPT)$@ $^ $(LIBS)
+ 	$(POST_BUILD_STEP)
+ 
+ invoke: