Skip to content

Commit b02375d

Browse files
dg0ytOsyotr
andauthored
[icu] Update to 78.1 (microsoft#48073)
Co-authored-by: Osyotr <[email protected]>
1 parent 256d546 commit b02375d

18 files changed

+109
-147
lines changed

ports/duckdb/portfile.cmake

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ vcpkg_cmake_configure(
116116
"-DBUILD_EXTENSIONS=${BUILD_EXTENSIONS}"
117117
-DBUILD_SHELL=FALSE
118118
-DBUILD_UNITTESTS=OFF
119+
-DCMAKE_CXX_STANDARD=17
119120
-DCMAKE_JOB_POOL_LINK=console # Serialize linking to avoid OOM
120121
-DENABLE_EXTENSION_AUTOINSTALL=1
121122
-DENABLE_EXTENSION_AUTOLOADING=1
@@ -157,7 +158,7 @@ foreach(maybe_directory IN LISTS extension_dirs third_party_files)
157158
endforeach()
158159
vcpkg_install_copyright(
159160
COMMENT [[
160-
Duckdb contains copyies of many third-party packages which are subject to
161+
Duckdb contains copies of many third-party packages which are subject to
161162
separate license terms.
162163
]]
163164
FILE_LIST

ports/duckdb/vcpkg.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "duckdb",
33
"version": "1.4.1",
4-
"port-version": 1,
4+
"port-version": 2,
55
"description": "High-performance in-process analytical database system",
66
"homepage": "https://duckdb.org",
77
"license": null,

ports/icu/cleanup_msvc.patch

Lines changed: 0 additions & 17 deletions
This file was deleted.

ports/icu/disable-escapestr-tool.patch

Lines changed: 0 additions & 17 deletions
This file was deleted.

ports/icu/fix-extra.patch

Lines changed: 0 additions & 13 deletions
This file was deleted.

ports/icu/fix-win-build.patch

Lines changed: 0 additions & 35 deletions
This file was deleted.
File renamed without changes.
File renamed without changes.

ports/icu/mh-msys-msvc.patch

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
diff --git a/source/config/mh-msys-msvc b/source/config/mh-msys-msvc
2+
index 6f50798..2a669b3 100644
3+
--- a/source/config/mh-msys-msvc
4+
+++ b/source/config/mh-msys-msvc
5+
@@ -54,7 +54,7 @@ endif
6+
# -D_CRT_SECURE_NO_DEPRECATE is needed to quiet warnings about using standard C functions.
7+
# -utf-8 set source file encoding to utf-8.
8+
CFLAGS+=-GF -nologo -utf-8
9+
-CXXFLAGS+=-GF -nologo -EHsc -Zc:wchar_t -utf-8
10+
+CXXFLAGS+=-GF -nologo -EHsc -Zc:wchar_t -utf-8 -std:c++17
11+
CPPFLAGS+=-D_CRT_SECURE_NO_DEPRECATE
12+
DEFS+=-DWIN32 -DCYGWINMSVC
13+
LDFLAGS+=-nologo
14+
@@ -90,8 +90,6 @@ LIBSICU = $(STATIC_PREFIX)$(ICUPREFIX)
15+
A = lib
16+
17+
# Cygwin's ar can't handle Win64 right now. So we use Microsoft's tool instead.
18+
-AR = LIB.EXE#M#
19+
-ARFLAGS := -nologo $(ARFLAGS:r=)#M#
20+
RANLIB = ls -s#M#
21+
AR_OUTOPT = -OUT:#M#
22+

ports/icu/mingw-strict-ansi.diff

Lines changed: 0 additions & 12 deletions
This file was deleted.

0 commit comments

Comments
 (0)