mirror of https://github.com/microsoft/vcpkg.git
[abseil] Bump to 20230802.0 (#33099)
* [abseil] Bump to 20230802.0 * update version database * apply suggestions * update version database
This commit is contained in:
Weihang Ding
GitHub
parent
a6054ccaf4
commit
d36252e12a
|
|
@ -1,36 +0,0 @@
|
|||
From c205ad7b772efcf8c03bd898eb54791b42f1f762 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
|
||||
Date: Tue, 25 Jul 2023 00:20:55 +0200
|
||||
Subject: [PATCH] Don't depend on CoreFoundation with an absolute path.
|
||||
|
||||
---
|
||||
absl/time/CMakeLists.txt | 6 +-----
|
||||
1 file changed, 1 insertion(+), 5 deletions(-)
|
||||
|
||||
diff --git a/absl/time/CMakeLists.txt b/absl/time/CMakeLists.txt
|
||||
index 7b72054..c3392ae 100644
|
||||
--- a/absl/time/CMakeLists.txt
|
||||
+++ b/absl/time/CMakeLists.txt
|
||||
@@ -54,10 +54,6 @@ absl_cc_library(
|
||||
${ABSL_DEFAULT_COPTS}
|
||||
)
|
||||
|
||||
-if(APPLE)
|
||||
- find_library(CoreFoundation CoreFoundation)
|
||||
-endif()
|
||||
-
|
||||
absl_cc_library(
|
||||
NAME
|
||||
time_zone
|
||||
@@ -84,7 +80,7 @@ absl_cc_library(
|
||||
COPTS
|
||||
${ABSL_DEFAULT_COPTS}
|
||||
DEPS
|
||||
- $<$<PLATFORM_ID:Darwin>:${CoreFoundation}>
|
||||
+ $<$<PLATFORM_ID:Darwin>:-Wl,-framework,CoreFoundation>
|
||||
)
|
||||
|
||||
# Internal-only target, do not depend on directly.
|
||||
--
|
||||
2.25.1
|
||||
|
||||
|
|
@ -1,24 +0,0 @@
|
|||
diff --git a/CMake/AbseilDll.cmake b/CMake/AbseilDll.cmake
|
||||
index c4a41e6..da46613 100644
|
||||
--- a/CMake/AbseilDll.cmake
|
||||
+++ b/CMake/AbseilDll.cmake
|
||||
@@ -787,7 +787,7 @@ Cflags: -I\${includedir}${PC_CFLAGS}\n")
|
||||
# Abseil libraries require C++14 as the current minimum standard. When
|
||||
# compiled with C++17 (either because it is the compiler's default or
|
||||
# explicitly requested), then Abseil requires C++17.
|
||||
- _absl_target_compile_features_if_available(${_NAME} PUBLIC ${ABSL_INTERNAL_CXX_STD_FEATURE})
|
||||
+ _absl_target_compile_features_if_available(${_dll} PUBLIC ${ABSL_INTERNAL_CXX_STD_FEATURE})
|
||||
else()
|
||||
# Note: This is legacy (before CMake 3.8) behavior. Setting the
|
||||
# target-level CXX_STANDARD property to ABSL_CXX_STANDARD (which is
|
||||
@@ -797,8 +797,8 @@ Cflags: -I\${includedir}${PC_CFLAGS}\n")
|
||||
# CXX_STANDARD_REQUIRED does guard against the top-level CMake project
|
||||
# not having enabled CMAKE_CXX_STANDARD_REQUIRED (which prevents
|
||||
# "decaying" to an older standard if the requested one isn't available).
|
||||
- set_property(TARGET ${_NAME} PROPERTY CXX_STANDARD ${ABSL_CXX_STANDARD})
|
||||
- set_property(TARGET ${_NAME} PROPERTY CXX_STANDARD_REQUIRED ON)
|
||||
+ set_property(TARGET ${_dll} PROPERTY CXX_STANDARD ${ABSL_CXX_STANDARD})
|
||||
+ set_property(TARGET ${_dll} PROPERTY CXX_STANDARD_REQUIRED ON)
|
||||
endif()
|
||||
|
||||
install(TARGETS ${_dll} EXPORT ${PROJECT_NAME}Targets
|
||||
|
|
@ -5,12 +5,9 @@ endif()
|
|||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO abseil/abseil-cpp
|
||||
REF 20230125.3
|
||||
SHA512 50509acfc4128fd31435631f71ac8cd0350acd9e290f78502723149016e7f07c9d84182ba99e0938b1873fecda09393d3fd7af8dabfb0d89cdcdd8a69a917e70
|
||||
REF "${VERSION}"
|
||||
SHA512 320295fa687ded05b774741eb4c5285291d44cc14402ec5d997057cb4f53fb3ba54cd162c7a7b1003312b677603a1c25e14bfdbd1fc22ccf4b4443e8a6e3ec02
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
fix-dll-support.patch
|
||||
core-foundation-deps.patch
|
||||
)
|
||||
|
||||
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
||||
|
|
@ -44,16 +41,16 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share"
|
|||
"${CURRENT_PACKAGES_DIR}/include/absl/time/internal/cctz/testdata"
|
||||
)
|
||||
|
||||
if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
|
||||
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/absl/base/config.h"
|
||||
"#elif defined(ABSL_CONSUME_DLL)" "#elif 1"
|
||||
)
|
||||
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/absl/base/internal/thread_identity.h"
|
||||
"&& !defined(ABSL_CONSUME_DLL)" "&& 0"
|
||||
)
|
||||
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/absl/container/internal/hashtablez_sampler.h"
|
||||
"!defined(ABSL_CONSUME_DLL)" "0"
|
||||
)
|
||||
if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
|
||||
file(GLOB_RECURSE headers "${CURRENT_PACKAGES_DIR}/include/absl/*.h")
|
||||
foreach(header IN LISTS ${headers})
|
||||
vcpkg_replace_string("${header}"
|
||||
"!defined(ABSL_CONSUME_DLL)" "0"
|
||||
)
|
||||
vcpkg_replace_string("${header}"
|
||||
"defined(ABSL_CONSUME_DLL)" "1"
|
||||
)
|
||||
endforeach()
|
||||
endif()
|
||||
|
||||
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
||||
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{
|
||||
"name": "abseil",
|
||||
"version": "20230125.3",
|
||||
"port-version": 1,
|
||||
"version": "20230802.0",
|
||||
"description": [
|
||||
"an open-source collection designed to augment the C++ standard library.",
|
||||
"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.",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "95cfb844950f2cc3e1a530bd23967ee2ea218f74",
|
||||
"version": "20230802.0",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "370a6da6fa1c5e259a8c8deec863e705aa423be6",
|
||||
"version": "20230125.3",
|
||||
|
|
|
|||
|
|
@ -17,8 +17,8 @@
|
|||
"port-version": 0
|
||||
},
|
||||
"abseil": {
|
||||
"baseline": "20230125.3",
|
||||
"port-version": 1
|
||||
"baseline": "20230802.0",
|
||||
"port-version": 0
|
||||
},
|
||||
"absent": {
|
||||
"baseline": "0.3.1",
|
||||
|
|
|
|||
Loading…
Reference in New Issue