[abseil] update to 20240722.0 (#40297)

This commit is contained in:
c8ef 2024-08-07 05:22:36 +08:00 committed by GitHub
parent 3923bb3d6a
commit 4327b9c40a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 18 additions and 1366 deletions

View File

@ -1,29 +0,0 @@
From c025a934b199d069510bb68ee552ae58a4394916 Mon Sep 17 00:00:00 2001
From: Derek Mauro <dmauro@google.com>
Date: Tue, 21 May 2024 09:57:36 -0700
Subject: [PATCH] Fix missing #include <random> for
std::uniform_int_distribution
Fixes #1676
PiperOrigin-RevId: 635840902
Change-Id: Ifc4099175f1c5f040f55a9f5a47fe0c996af79d1
---
absl/algorithm/container.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/absl/algorithm/container.h b/absl/algorithm/container.h
index c7bafae1..a2d126b7 100644
--- a/absl/algorithm/container.h
+++ b/absl/algorithm/container.h
@@ -44,6 +44,7 @@
#include <cassert>
#include <iterator>
#include <numeric>
+#include <random>
#include <type_traits>
#include <unordered_map>
#include <unordered_set>
--
2.44.0.windows.1

View File

@ -1,12 +0,0 @@
diff --git a/absl/container/CMakeLists.txt b/absl/container/CMakeLists.txt
index 449a2cad17e..ee9ca9c3c4a 100644
--- a/absl/container/CMakeLists.txt
+++ b/absl/container/CMakeLists.txt
@@ -213,6 +213,7 @@ absl_cc_library(
DEPS
absl::config
GTest::gmock
+ TESTONLY
)
absl_cc_test(

View File

@ -1,4 +1,4 @@
if (NOT VCPKG_TARGET_IS_WINDOWS)
if(NOT VCPKG_TARGET_IS_WINDOWS)
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
endif()
@ -6,12 +6,8 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO abseil/abseil-cpp
REF "${VERSION}"
SHA512 5062e731ee8c9a757e6d75fc1c558652deb4dd1daab4d6143f7ad52a139501c61365f89acbf82480be0f9a4911a58286560068d8b1a8b6774e6afad51739766e
SHA512 bd2cca8f007f2eee66f51c95a979371622b850ceb2ce3608d00ba826f7c494a1da0fba3c1427728f2c173fe50d59b701da35c2c9fdad2752a5a49746b1c8ef31
HEAD_REF master
PATCHES
0001-revert-integer-to-string-conversion-optimizations.patch # Fix openvino MSVC compile error
0002-Fix-missing-include-random-for-std-uniform_int_distr.patch # Fix missing include for std::uniform_int_distribution
779a356-test-allocator.diff
)
# With ABSL_PROPAGATE_CXX_STD=ON abseil automatically detect if it is being
@ -19,9 +15,14 @@ vcpkg_from_github(
# header accordingly. This works even if CMAKE_CXX_STANDARD is not set. Abseil
# uses the compiler default behavior to update `absl/base/options.h` as needed.
set(ABSL_USE_CXX17_OPTION "")
if ("cxx17" IN_LIST FEATURES)
if("cxx17" IN_LIST FEATURES)
set(ABSL_USE_CXX17_OPTION "-DCMAKE_CXX_STANDARD=17")
endif ()
endif()
set(ABSL_STATIC_RUNTIME_OPTION "")
if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_CRT_LINKAGE STREQUAL "static")
set(ABSL_STATIC_RUNTIME_OPTION "-DABSL_MSVC_STATIC_RUNTIME=ON")
endif()
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
@ -29,6 +30,7 @@ vcpkg_cmake_configure(
OPTIONS
-DABSL_PROPAGATE_CXX_STD=ON
${ABSL_USE_CXX17_OPTION}
${ABSL_STATIC_RUNTIME_OPTION}
)
vcpkg_cmake_install()

View File

@ -1,7 +1,6 @@
{
"name": "abseil",
"version": "20240116.2",
"port-version": 3,
"version": "20240722.0",
"description": [
"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.",
"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.",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "95ed5fee53b8698ac2cc6687f470e6fa76474a3a",
"version": "20240722.0",
"port-version": 0
},
{
"git-tree": "dcd1d7ce3c896f86473b155e608bb9cfdaae2d94",
"version": "20240116.2",

View File

@ -17,8 +17,8 @@
"port-version": 1
},
"abseil": {
"baseline": "20240116.2",
"port-version": 3
"baseline": "20240722.0",
"port-version": 0
},
"absent": {
"baseline": "0.3.1",