Skip to content

Commit 267c6f3

Browse files
committed
Update vcpkg's abseil port to hte latest
1 parent e666503 commit 267c6f3

File tree

3 files changed

+9
-41
lines changed

3 files changed

+9
-41
lines changed

cmake/vcpkg-ports/abseil/absl_windows.patch

+7-29
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
diff --git a/absl/base/attributes.h b/absl/base/attributes.h
2-
index 5ea5ee3e..f4949898 100644
2+
index ac2ca801..a5fad567 100644
33
--- a/absl/base/attributes.h
44
+++ b/absl/base/attributes.h
5-
@@ -559,7 +559,7 @@
5+
@@ -562,7 +562,7 @@
66
#undef ABSL_ATTRIBUTE_UNUSED
77
#define ABSL_ATTRIBUTE_UNUSED __attribute__((__unused__))
88
#else
@@ -11,28 +11,6 @@ index 5ea5ee3e..f4949898 100644
1111
#endif
1212

1313
// ABSL_ATTRIBUTE_INITIAL_EXEC
14-
diff --git a/absl/container/internal/raw_hash_set.h b/absl/container/internal/raw_hash_set.h
15-
index d4fe8f5c..27418d13 100644
16-
--- a/absl/container/internal/raw_hash_set.h
17-
+++ b/absl/container/internal/raw_hash_set.h
18-
@@ -1924,7 +1924,7 @@ HashtablezInfoHandle SampleHashtablezInfo(size_t sizeof_slot, size_t sizeof_key,
19-
// In SOO, we sample on the first insertion so if this is an empty SOO case
20-
// (e.g. when reserve is called), then we still need to sample.
21-
if (kSooEnabled && was_soo && c.size() == 0) {
22-
- return Sample(sizeof_slot, sizeof_key, sizeof_value, SooCapacity());
23-
+ return Sample(sizeof_slot, sizeof_key, sizeof_value, (int16_t)SooCapacity());
24-
}
25-
// For non-SOO cases, we sample whenever the capacity is increasing from zero
26-
// to non-zero.
27-
@@ -3525,7 +3525,7 @@ class raw_hash_set {
28-
assert(is_soo());
29-
if (!ShouldSampleHashtablezInfo<CharAlloc>()) return HashtablezInfoHandle{};
30-
return Sample(sizeof(slot_type), sizeof(key_type), sizeof(value_type),
31-
- SooCapacity());
32-
+ (int16_t)SooCapacity());
33-
}
34-
35-
inline void destroy_slots() {
3614
diff --git a/absl/copts/GENERATED_AbseilCopts.cmake b/absl/copts/GENERATED_AbseilCopts.cmake
3715
index da2282fe..4c7fc26f 100644
3816
--- a/absl/copts/GENERATED_AbseilCopts.cmake
@@ -60,7 +38,7 @@ index b9e0071e..dd8410ec 100644
6038
"/wd4800",
6139
"/DNOMINMAX",
6240
diff --git a/absl/copts/copts.py b/absl/copts/copts.py
63-
index 2d85ac74..4875d668 100644
41+
index d1cfe429..3685e023 100644
6442
--- a/absl/copts/copts.py
6543
+++ b/absl/copts/copts.py
6644
@@ -118,10 +118,6 @@ MSVC_WARNING_FLAGS = [
@@ -75,18 +53,18 @@ index 2d85ac74..4875d668 100644
7553
"/wd4503",
7654
# forcing value to bool 'true' or 'false' (performance warning)
7755
diff --git a/absl/debugging/symbolize.cc b/absl/debugging/symbolize.cc
78-
index 638d3954..6b817075 100644
56+
index 344436f9..d45452f9 100644
7957
--- a/absl/debugging/symbolize.cc
8058
+++ b/absl/debugging/symbolize.cc
81-
@@ -14,7 +14,7 @@
59+
@@ -16,7 +16,7 @@
8260

8361
#include "absl/debugging/symbolize.h"
8462

8563
-#ifdef _WIN32
8664
+#if defined(_WIN32) && !defined(NDEBUG)
8765
#include <winapifamily.h>
88-
#if !(WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP)) || \
89-
WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
66+
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
67+
// UWP doesn't have access to win32 APIs.
9068
diff --git a/absl/debugging/symbolize_win32.inc b/absl/debugging/symbolize_win32.inc
9169
index 53a099a1..34d210d6 100644
9270
--- a/absl/debugging/symbolize_win32.inc

cmake/vcpkg-ports/abseil/portfile.cmake

+1-11
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,11 @@ vcpkg_from_github(
66
OUT_SOURCE_PATH SOURCE_PATH
77
REPO abseil/abseil-cpp
88
REF "${VERSION}"
9-
SHA512 bd2cca8f007f2eee66f51c95a979371622b850ceb2ce3608d00ba826f7c494a1da0fba3c1427728f2c173fe50d59b701da35c2c9fdad2752a5a49746b1c8ef31
9+
SHA512 2a021faad807ee3e23548716ffa4785dc2409edbb4be676cc4bc01d47885760de340f0a4afdcbf0aaa835affd6d78f7bc319bbf7d337dbc30e7a559d0088e4bd
1010
HEAD_REF master
1111
PATCHES absl_windows.patch
1212
)
1313

14-
# With ABSL_PROPAGATE_CXX_STD=ON abseil automatically detect if it is being
15-
# compiled with C++14 or C++17, and modifies the installed `absl/base/options.h`
16-
# header accordingly. This works even if CMAKE_CXX_STANDARD is not set. Abseil
17-
# uses the compiler default behavior to update `absl/base/options.h` as needed.
18-
set(ABSL_USE_CXX17_OPTION "")
19-
if("cxx17" IN_LIST FEATURES)
20-
set(ABSL_USE_CXX17_OPTION "-DCMAKE_CXX_STANDARD=17")
21-
endif()
22-
2314
set(ABSL_STATIC_RUNTIME_OPTION "")
2415
if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_CRT_LINKAGE STREQUAL "static")
2516
set(ABSL_STATIC_RUNTIME_OPTION "-DABSL_MSVC_STATIC_RUNTIME=ON")
@@ -30,7 +21,6 @@ vcpkg_cmake_configure(
3021
DISABLE_PARALLEL_CONFIGURE
3122
OPTIONS
3223
-DABSL_PROPAGATE_CXX_STD=ON
33-
${ABSL_USE_CXX17_OPTION}
3424
${ABSL_STATIC_RUNTIME_OPTION}
3525
)
3626

cmake/vcpkg-ports/abseil/vcpkg.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "abseil",
3-
"version": "20240722.0",
3+
"version": "20250127.0",
44
"description": [
55
"Abseil is an open-source collection of C++ library code designed to augment the C++ standard library. The Abseil library code is collected from Google's own C++ code base, has been extensively tested and used in production, and is the same code we depend on in our daily coding lives.",
66
"In some cases, Abseil provides pieces missing from the C++ standard; in others, Abseil provides alternatives to the standard for special needs we've found through usage in the Google code base. We denote those cases clearly within the library code we provide you.",

0 commit comments

Comments
 (0)