[V8, icu] Update v8 to version 9.0.257.17, icu to 69.1 (#16077)

This change also includes a change to use the
Windows SDK as reported by the WinSDK ENV variable.
v8 9.0257.17 requires ICU to be version 68.x or up.

5 files changed, 12 insertions, 88 deletions

diff --git a/ports/icu/CONTROL b/ports/icu/CONTROL
index 96c578b09..5dbdaaab4 100644
--- a/ports/icu/CONTROL
+++ b/ports/icu/CONTROL
@@ -1,5 +1,5 @@
 Source: icu
-Version: 67.1
+Version: 69.1
 Port-Version: 8
 Homepage: http://icu-project.org/apiref/icu4c/
 Description: Mature and widely used Unicode and localization library.
diff --git a/ports/icu/fix_parallel_build_on_windows.patch b/ports/icu/fix_parallel_build_on_windows.patch
index b3b42b423..6bd91094a 100644
--- a/ports/icu/fix_parallel_build_on_windows.patch
+++ b/ports/icu/fix_parallel_build_on_windows.patch
@@ -1,25 +1,25 @@
 diff --urN a/source/data/Makefile.in b/source/data/Makefile.in
 --- a/source/data/Makefile.in
 +++ b/source/data/Makefile.in
-@@ -221,11 +221,12 @@
+@@ -236,11 +236,12 @@
  ## Include the main build rules for data files
  include $(top_builddir)/$(subdir)/rules.mk
-
+ 
 +PKGDATA_LIST = $(TMP_DIR)/icudata.lst
-
+ 
  ifeq ($(ENABLE_SO_VERSION_DATA),1)
  ifeq ($(PKGDATA_MODE),dll)
  SO_VERSION_DATA = $(OUTTMPDIR)/icudata.res
--$(SO_VERSION_DATA) : $(MISCSRCDIR)/icudata.rc
+-$(SO_VERSION_DATA) : $(MISCSRCDIR)/icudata.rc | $(TMP_DIR)/dirs.timestamp
 +$(SO_VERSION_DATA) : $(MISCSRCDIR)/icudata.rc $(PKGDATA_LIST)
  ifeq ($(MSYS_RC_MODE),1)
-        rc.exe -i$(srcdir)/../common -i$(top_builddir)/common -fo$@ $(CPPFLAGS) $<
+ 	rc.exe -i$(srcdir)/../common -i$(top_builddir)/common -fo$@ $(CPPFLAGS) $<
  else
-@@ -234,7 +235,6 @@
+@@ -249,7 +250,6 @@
  endif
  endif
-
+ 
 -PKGDATA_LIST = $(TMP_DIR)/icudata.lst
-
-
+ 
+ 
  #####################################################
diff --git a/ports/icu/mingw-remove-bsymbolic.patch b/ports/icu/mingw-remove-bsymbolic.patch
deleted file mode 100644
index 984bba293..000000000
--- a/ports/icu/mingw-remove-bsymbolic.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/source/config/mh-mingw b/source/config/mh-mingw

-index a28e47b..7d77ec0 100644

---- a/source/config/mh-mingw

-+++ b/source/config/mh-mingw

-@@ -57,7 +57,7 @@ LINK.c=       $(CXX) $(CXXFLAGS) $(LDFLAGS)

- #LINK.cc=      $(CXX) $(CXXFLAGS) $(LDFLAGS)

- 

- ## Shared library options

--LD_SOOPTIONS= -Wl,-Bsymbolic

-+LD_SOOPTIONS=

- 

- ## Commands to make a shared library

- SHLIB.c=	$(CC) $(CFLAGS) $(LDFLAGS) -shared $(LD_SOOPTIONS) -Wl,--enable-auto-import -Wl,--out-implib=$(dir $@)lib$(notdir $(@:$(SO_TARGET_VERSION_MAJOR).$(SO)=))$(IMPORT_LIB_EXT)#M#

-diff --git a/source/config/mh-mingw64 b/source/config/mh-mingw64

-index afe2c0e..ca0b8d4 100644

---- a/source/config/mh-mingw64

-+++ b/source/config/mh-mingw64

-@@ -57,7 +57,7 @@ LINK.c=       $(CXX) $(CXXFLAGS) $(LDFLAGS)

- #LINK.cc=      $(CXX) $(CXXFLAGS) $(LDFLAGS)

- 

- ## Shared library options

--LD_SOOPTIONS= -Wl,-Bsymbolic

-+LD_SOOPTIONS=

- 

- ## Commands to make a shared library

- SHLIB.c=	$(CC) $(CFLAGS) $(LDFLAGS) -shared $(LD_SOOPTIONS) -Wl,--enable-auto-import -Wl,--out-implib=$(dir $@)lib$(notdir $(@:$(SO_TARGET_VERSION_MAJOR).$(SO)=))$(IMPORT_LIB_EXT)#M#

diff --git a/ports/icu/mingw-remove-version-from-link-flags.patch b/ports/icu/mingw-remove-version-from-link-flags.patch
deleted file mode 100644
index a0b4657ec..000000000
--- a/ports/icu/mingw-remove-version-from-link-flags.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff --git a/source/config/mh-mingw b/source/config/mh-mingw

-index 7d77ec0..30f6e5b 100644

---- a/source/config/mh-mingw

-+++ b/source/config/mh-mingw

-@@ -101,11 +101,14 @@ LIBICU = $(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX)

- #SH#ICULIBS_COMMON_LIB_NAME="${LIBICU}${COMMON_STUBNAME}${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}.${SO}"

- #SH#ICULIBS_COMMON_LIB_NAME_A="${LIBICU}${COMMON_STUBNAME}${ICULIBSUFFIX}.${A}"

- 

--#SH#ICULIBS_DATA="-l$(ICUPREFIX)$(DATA_STUBNAME)$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)"

--ICULIBS_DT="-l$(ICUPREFIX)$(DATA_STUBNAME)$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)"

--ICULIBS_I18N="-l$(ICUPREFIX)$(I18N_STUBNAME)$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)"

--ICULIBS_IO="-l$(ICUPREFIX)$(IO_STUBNAME)$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)"

--ICULIBS_UC="-l$(ICUPREFIX)$(COMMON_STUBNAME)$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)"

-+#SH#ICULIBS_DATA="-l$(ICUPREFIX)$(DATA_STUBNAME)$(ICULIBSUFFIX)"

-+ICULIBS_DT="-l$(ICUPREFIX)$(DATA_STUBNAME)$(ICULIBSUFFIX)"

-+ICULIBS_I18N="-l$(ICUPREFIX)$(I18N_STUBNAME)$(ICULIBSUFFIX)"

-+ICULIBS_LX="-l$(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX)$(LAYOUTEX_STUBNAME)$(ICULIBSUFFIX)"

-+ICULIBS_IO="-l$(ICUPREFIX)$(IO_STUBNAME)$(ICULIBSUFFIX)"

-+ICULIBS_UC="-l$(ICUPREFIX)$(COMMON_STUBNAME)$(ICULIBSUFFIX)"

-+ICULIBS_CTESTFW="-l$(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX)$(CTESTFW_STUBNAME)$(ICULIBSUFFIX)"

-+ICULIBS_TOOLUTIL="-l$(ICUPREFIX)tu$(ICULIBSUFFIX)"

- #SH#

- #SH## ICULIBS is the set of libraries your application should link

- #SH## with usually. Many applications will want to add ${ICULIBS_I18N} as well. 

-diff --git a/source/config/mh-mingw64 b/source/config/mh-mingw64

-index ca0b8d4..fb64c56 100644

---- a/source/config/mh-mingw64

-+++ b/source/config/mh-mingw64

-@@ -101,11 +101,14 @@ LIBICU = $(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX)

- #SH#ICULIBS_COMMON_LIB_NAME="${LIBICU}${COMMON_STUBNAME}${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}.${SO}"

- #SH#ICULIBS_COMMON_LIB_NAME_A="${LIBICU}${COMMON_STUBNAME}${ICULIBSUFFIX}.${A}"

- 

--#SH#ICULIBS_DATA="-l$(ICUPREFIX)$(DATA_STUBNAME)$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)"

--ICULIBS_DT="-l$(ICUPREFIX)$(DATA_STUBNAME)$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)"

--ICULIBS_I18N="-l$(ICUPREFIX)$(I18N_STUBNAME)$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)"

--ICULIBS_IO="-l$(ICUPREFIX)$(IO_STUBNAME)$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)"

--ICULIBS_UC="-l$(ICUPREFIX)$(COMMON_STUBNAME)$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)"

-+#SH#ICULIBS_DATA="-l$(ICUPREFIX)$(DATA_STUBNAME)$(ICULIBSUFFIX)"

-+ICULIBS_DT="-l$(ICUPREFIX)$(DATA_STUBNAME)$(ICULIBSUFFIX)"

-+ICULIBS_I18N="-l$(ICUPREFIX)$(I18N_STUBNAME)$(ICULIBSUFFIX)"

-+ICULIBS_LX="-l$(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX)$(LAYOUTEX_STUBNAME)$(ICULIBSUFFIX)"

-+ICULIBS_IO="-l$(ICUPREFIX)$(IO_STUBNAME)$(ICULIBSUFFIX)"

-+ICULIBS_UC="-l$(ICUPREFIX)$(COMMON_STUBNAME)$(ICULIBSUFFIX)"

-+ICULIBS_CTESTFW="-l$(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX)$(CTESTFW_STUBNAME)$(ICULIBSUFFIX)"

-+ICULIBS_TOOLUTIL="-l$(ICUPREFIX)tu$(ICULIBSUFFIX)"

- #SH#

- #SH## ICULIBS is the set of libraries your application should link

- #SH## with usually. Many applications will want to add ${ICULIBS_I18N} as well. 

diff --git a/ports/icu/portfile.cmake b/ports/icu/portfile.cmake
index 60fb60228..2960b2eb3 100644
--- a/ports/icu/portfile.cmake
+++ b/ports/icu/portfile.cmake
@@ -1,6 +1,6 @@
 vcpkg_fail_port_install(ON_TARGET "uwp")
 
-set(ICU_VERSION_MAJOR 67)
+set(ICU_VERSION_MAJOR 69)
 set(ICU_VERSION_MINOR 1)
 set(VERSION "${ICU_VERSION_MAJOR}.${ICU_VERSION_MINOR}")
 set(VERSION2 "${ICU_VERSION_MAJOR}_${ICU_VERSION_MINOR}")
@@ -10,7 +10,7 @@ vcpkg_download_distfile(
     ARCHIVE
     URLS "https://github.com/unicode-org/icu/releases/download/release-${VERSION3}/icu4c-${VERSION2}-src.tgz"
     FILENAME "icu4c-${VERSION2}-src.tgz"
-    SHA512 4779f1ce1ca7976f6fad6768853ea8c540da54d11509e3b6cfd864a04b5f2db1c3d4b546387f91ad02fb90804525bc37d2543173f0d705d6ca11dc6f2b7640a8
+    SHA512 d4aeb781715144ea6e3c6b98df5bbe0490bfa3175221a1d667f3e6851b7bd4a638fa4a37d4a921ccb31f02b5d15a6dded9464d98051964a86f7b1cde0ff0aab7 
 )
 vcpkg_extract_source_archive_ex(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -20,8 +20,6 @@ vcpkg_extract_source_archive_ex(
         ${CMAKE_CURRENT_LIST_DIR}/remove-MD-from-configure.patch
         ${CMAKE_CURRENT_LIST_DIR}/fix_parallel_build_on_windows.patch
         ${CMAKE_CURRENT_LIST_DIR}/fix-extra.patch
-        ${CMAKE_CURRENT_LIST_DIR}/mingw-remove-bsymbolic.patch
-        ${CMAKE_CURRENT_LIST_DIR}/mingw-remove-version-from-link-flags.patch
 )
 
 vcpkg_find_acquire_program(PYTHON3)