11diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake
2- index 7cab6f726..697ab1bb4 100644
2+ index 6788bc7b7f..6b689dedf0 100644
33--- a/ports/curl/portfile.cmake
44+++ b/ports/curl/portfile.cmake
5- @@ -84,9 +84,12 @@ vcpkg_cmake_configure(
6- -DBUILD_TESTING=OFF
5+ @@ -83,10 +83,13 @@ vcpkg_cmake_configure(
76 -DENABLE_CURL_MANUAL=OFF
8- -DCURL_CA_FALLBACK=ON
7+ -DIMPORT_LIB_SUFFIX= # empty
8+ -DSHARE_LIB_OBJECT=OFF
99+ -DCURL_CA_PATH=none
1010+ -DCURL_CA_BUNDLE=none
11+ -DCURL_USE_PKGCONFIG=ON
1112 -DCMAKE_DISABLE_FIND_PACKAGE_Perl=ON
12- OPTIONS_DEBUG
13- -DENABLE_DEBUG=ON
13+ MAYBE_UNUSED_VARIABLES
14+ PKG_CONFIG_EXECUTABLE
1415+ ${EXTRA_ARGS_DEBUG}
1516 )
1617 vcpkg_cmake_install()
1718 vcpkg_copy_pdbs()
1819diff --git a/ports/llvm/portfile.cmake b/ports/llvm/portfile.cmake
19- index a79c72a59..6b7fa6a66 100644
20+ index 7764357a6d..da7374ecec 100644
2021--- a/ports/llvm/portfile.cmake
2122+++ b/ports/llvm/portfile.cmake
22- @@ -292 ,6 +292 ,8 @@ vcpkg_cmake_configure(
23+ @@ -302 ,6 +302 ,8 @@ vcpkg_cmake_configure(
2324 ${FEATURE_OPTIONS}
2425 MAYBE_UNUSED_VARIABLES
2526 COMPILER_RT_ENABLE_IOS
@@ -28,92 +29,52 @@ index a79c72a59..6b7fa6a66 100644
2829 )
2930
3031 vcpkg_cmake_install(ADD_BIN_TO_PATH)
31- diff --git a/ports/snappy/portfile.cmake b/ports/snappy/portfile.cmake
32- index 0312b2ae1..fdb576b5f 100644
33- --- a/ports/snappy/portfile.cmake
34- +++ b/ports/snappy/portfile.cmake
35- @@ -8,5 +8,6 @@ vcpkg_from_github(
36- fix_clang-cl_build.patch
37- no-werror.patch
38- pkgconfig.diff
39- + "snappy-disable-bmi.patch"
40- )
41- file(COPY "${CURRENT_PORT_DIR}/snappy.pc.in" DESTINATION "${SOURCE_PATH}")
42- diff --git a/ports/snappy/snappy-disable-bmi.patch b/ports/snappy/snappy-disable-bmi.patch
32+ diff --git a/ports/orc/orc-fix-exception-propagation.diff b/ports/orc/orc-fix-exception-propagation.diff
4333new file mode 100644
44- index 000000000..e839c93a4
34+ index 0000000000..25568e70cd
4535--- /dev/null
46- +++ b/ports/snappy/snappy-disable-bmi.patch
47- @@ -0,0 +1,19 @@
48- + diff --git a/snappy.cc b/snappy.cc
49- + index d414718..7b49d2a 100644
50- + --- a/snappy.cc
51- + +++ b/snappy.cc
52- + @@ -1014,14 +1014,10 @@ static inline void Report(const char *algorithm, size_t compressed_size,
53- + static inline uint32_t ExtractLowBytes(const uint32_t& v, int n) {
54- + assert(n >= 0);
55- + assert(n <= 4);
56- + -#if SNAPPY_HAVE_BMI2
57- + - return _bzhi_u32(v, 8 * n);
58- + -#else
59- + // This needs to be wider than uint32_t otherwise `mask << 32` will be
60- + // undefined.
61- + uint64_t mask = 0xffffffff;
62- + return v & ~(mask << (8 * n));
63- + -#endif
64- + }
36+ +++ b/ports/orc/orc-fix-exception-propagation.diff
37+ @@ -0,0 +1,30 @@
38+ + diff --git a/c++/src/Timezone.cc b/c++/src/Timezone.cc
39+ + index 384f8ea99..07c75e0a7 100644
40+ + --- a/c++/src/Timezone.cc
41+ + +++ b/c++/src/Timezone.cc
42+ + @@ -696,12 +696,21 @@ namespace orc {
43+ + std::string filename_;
44+ + mutable std::unique_ptr<TimezoneImpl> impl_;
45+ + mutable std::once_flag initialized_;
46+ + + mutable std::exception_ptr init_exception_;
47+ +
48+ + TimezoneImpl* getImpl() const {
49+ + - std::call_once(initialized_, [&]() {
50+ + - auto buffer = loadTZDB(filename_);
51+ + - impl_ = std::make_unique<TimezoneImpl>(filename_, std::move(buffer));
52+ + - });
53+ + + std::call_once(initialized_, [&]() {
54+ + + try {
55+ + + auto buffer = loadTZDB(filename_);
56+ + + impl_ = std::make_unique<TimezoneImpl>(filename_, std::move(buffer));
57+ + + } catch (...) {
58+ + + // If initialization failed, re-throw the exception
59+ + + init_exception_ = std::current_exception();
60+ + + }
61+ + + });
62+ + + if (init_exception_) {
63+ + + std::rethrow_exception(init_exception_);
64+ + + }
65+ + return impl_.get();
66+ + }
6567+
66- + static inline bool LeftShiftOverflows(uint8_t value, uint32_t shift) {
67- diff --git a/ports/thrift/portfile.cmake b/ports/thrift/portfile.cmake
68- index 1501782..71d2147 100644
69- --- a/ports/thrift/portfile.cmake
70- +++ b/ports/thrift/portfile.cmake
71- @@ -12,7 +12,7 @@ vcpkg_find_acquire_program(BISON)
72- vcpkg_from_github(
73- OUT_SOURCE_PATH SOURCE_PATH
74- REPO apache/thrift
75- - REF "${VERSION}"
76- + REF "v${VERSION}"
77- SHA512 5e4ee9870b30fe5ba484d39781c435716f7f3903793dc8aae96594ca813b1a5a73363b84719038ca8fa3ab8ef0a419a28410d936ff7b3bbadf36fc085a6883ae
78- HEAD_REF master
79- PATCHES
80- diff --git a/ports/thrift/vcpkg.json b/ports/thrift/vcpkg.json
81- index 2d5a854..9ff49ec 100644
82- --- a/ports/thrift/vcpkg.json
83- +++ b/ports/thrift/vcpkg.json
84- @@ -1,6 +1,7 @@
85- {
86- "name": "thrift",
87- "version": "0.20.0",
88- + "port-version": 1,
89- "description": "Apache Thrift is a software project spanning a variety of programming languages and use cases. Our goal is to make reliable, performant communication and data serialization across languages as efficient and seamless as possible.",
90- "homepage": "https://github.com/apache/thrift",
91- "license": "Apache-2.0",
92- diff --git a/versions/baseline.json b/versions/baseline.json
93- index c6ce736..9ad1d63 100644
94- --- a/versions/baseline.json
95- +++ b/versions/baseline.json
96- @@ -8622,7 +8622,7 @@
97- },
98- "thrift": {
99- "baseline": "0.20.0",
100- - "port-version": 0
101- + "port-version": 1
102- },
103- "tidy-html5": {
104- "baseline": "5.8.0",
105- diff --git a/versions/t-/thrift.json b/versions/t-/thrift.json
106- index 3db38c5..7464bde 100644
107- --- a/versions/t-/thrift.json
108- +++ b/versions/t-/thrift.json
109- @@ -1,5 +1,10 @@
110- {
111- "versions": [
112- + {
113- + "git-tree": "13757a6b05741cf3c9c39e3a1dcc5e5cd685e025",
114- + "version": "0.20.0",
115- + "port-version": 1
116- + },
117- {
118- "git-tree": "6855be1ce96497811d4eb0a9879baf6cf1b3610c",
119- "version": "0.20.0",
68+ diff --git a/ports/orc/portfile.cmake b/ports/orc/portfile.cmake
69+ index 77ebf41ec3..4d065594a7 100644
70+ --- a/ports/orc/portfile.cmake
71+ +++ b/ports/orc/portfile.cmake
72+ @@ -6,6 +6,8 @@ vcpkg_from_github(
73+ REF "v${VERSION}"
74+ SHA512 eabee16a6e984452a8cb715d0524041b20dd1bd88d78bb32534db93e5dbdd786aa4df8c05975406cb0728241eb3025a506c4fefb8c334ef0d8a27e6cb920d44c
75+ HEAD_REF master
76+ + PATCHES
77+ + orc-fix-exception-propagation.diff
78+ )
79+
80+ file(REMOVE "${SOURCE_PATH}/cmake_modules/FindGTest.cmake")
0 commit comments