mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-24 17:29:01 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
7fd2b83b10
vcpkg/ports/icu/fix_parallel_build_on_windows.patch

26 lines
769 B
Diff
Raw Normal View History

[ICU] Upgrade ICU to 65.1 (#9122) * [ICU] Upgrade ICU to 65.1 * Fix wrong diff format. * Removed deprecated vcpkg_common_functions
2020-02-05 06:14:45 +08:00
diff --urN a/source/data/Makefile.in b/source/data/Makefile.in
[icu] Enable parallel builds (#6695) * Add VCPKG_NUM_LOGICAL_CORES * break out logic that retries running a command several times into its own function * Parallelize icu
2019-06-13 05:18:43 +08:00
--- a/source/data/Makefile.in
+++ b/source/data/Makefile.in
[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.
2021-04-20 08:15:39 +08:00
@@ -236,11 +236,12 @@
[ICU] Upgrade ICU to 65.1 (#9122) * [ICU] Upgrade ICU to 65.1 * Fix wrong diff format. * Removed deprecated vcpkg_common_functions
2020-02-05 06:14:45 +08:00
## Include the main build rules for data files
include $(top_builddir)/$(subdir)/rules.mk
[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.
2021-04-20 08:15:39 +08:00
[ICU] Upgrade ICU to 65.1 (#9122) * [ICU] Upgrade ICU to 65.1 * Fix wrong diff format. * Removed deprecated vcpkg_common_functions
2020-02-05 06:14:45 +08:00
+PKGDATA_LIST = $(TMP_DIR)/icudata.lst
[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.
2021-04-20 08:15:39 +08:00
[ICU] Upgrade ICU to 65.1 (#9122) * [ICU] Upgrade ICU to 65.1 * Fix wrong diff format. * Removed deprecated vcpkg_common_functions
2020-02-05 06:14:45 +08:00
ifeq ($(ENABLE_SO_VERSION_DATA),1)
ifeq ($(PKGDATA_MODE),dll)
SO_VERSION_DATA = $(OUTTMPDIR)/icudata.res
[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.
2021-04-20 08:15:39 +08:00
-$(SO_VERSION_DATA) : $(MISCSRCDIR)/icudata.rc | $(TMP_DIR)/dirs.timestamp
[ICU] Upgrade ICU to 65.1 (#9122) * [ICU] Upgrade ICU to 65.1 * Fix wrong diff format. * Removed deprecated vcpkg_common_functions
2020-02-05 06:14:45 +08:00
+$(SO_VERSION_DATA) : $(MISCSRCDIR)/icudata.rc $(PKGDATA_LIST)
ifeq ($(MSYS_RC_MODE),1)
[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.
2021-04-20 08:15:39 +08:00
rc.exe -i$(srcdir)/../common -i$(top_builddir)/common -fo$@ $(CPPFLAGS) $<
[ICU] Upgrade ICU to 65.1 (#9122) * [ICU] Upgrade ICU to 65.1 * Fix wrong diff format. * Removed deprecated vcpkg_common_functions
2020-02-05 06:14:45 +08:00
else
[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.
2021-04-20 08:15:39 +08:00
@@ -249,7 +250,6 @@
[icu] Enable parallel builds (#6695) * Add VCPKG_NUM_LOGICAL_CORES * break out logic that retries running a command several times into its own function * Parallelize icu
2019-06-13 05:18:43 +08:00
endif
[ICU] Upgrade ICU to 65.1 (#9122) * [ICU] Upgrade ICU to 65.1 * Fix wrong diff format. * Removed deprecated vcpkg_common_functions
2020-02-05 06:14:45 +08:00
endif
[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.
2021-04-20 08:15:39 +08:00
[ICU] Upgrade ICU to 65.1 (#9122) * [ICU] Upgrade ICU to 65.1 * Fix wrong diff format. * Removed deprecated vcpkg_common_functions
2020-02-05 06:14:45 +08:00
-PKGDATA_LIST = $(TMP_DIR)/icudata.lst
[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.
2021-04-20 08:15:39 +08:00
[ICU] Upgrade ICU to 65.1 (#9122) * [ICU] Upgrade ICU to 65.1 * Fix wrong diff format. * Removed deprecated vcpkg_common_functions
2020-02-05 06:14:45 +08:00
#####################################################
Reference in New Issue Copy Permalink