Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[abseil] Upgrade to 2021.1102 #22017

Merged
merged 5 commits into from
Dec 16, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 12 additions & 14 deletions ports/abseil/fix-cxx-standard.patch
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/CMake/abslConfig.cmake.in b/CMake/abslConfig.cmake.in
index 62d246d..00947cf 100644
index 62d246d..afcec1f 100644
--- a/CMake/abslConfig.cmake.in
+++ b/CMake/abslConfig.cmake.in
@@ -6,3 +6,5 @@ find_dependency(Threads)
Expand All @@ -8,12 +8,11 @@ index 62d246d..00947cf 100644
include ("${CMAKE_CURRENT_LIST_DIR}/@[email protected]")
+
+set(ABSL_USE_CXX17 @ABSL_USE_CXX17@)
\ No newline at end of file
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f0af6f6..927f4ed 100644
index 750a475..239977f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -57,6 +57,23 @@ else()
@@ -67,6 +67,23 @@ else()
option(ABSL_ENABLE_INSTALL "Enable install rule" ON)
endif()

Expand All @@ -34,28 +33,27 @@ index f0af6f6..927f4ed 100644
+ set(STD_VARIANT 0)
+endif()
+
list(APPEND CMAKE_MODULE_PATH
${CMAKE_CURRENT_LIST_DIR}/CMake
${CMAKE_CURRENT_LIST_DIR}/absl/copts
option(ABSL_PROPAGATE_CXX_STD
"Use CMake C++ standard meta features (e.g. cxx_std_11) that propagate to targets that link to Abseil"
OFF) # TODO: Default to ON for CMake 3.8 and greater.
diff --git a/absl/base/CMakeLists.txt b/absl/base/CMakeLists.txt
index 9ff5aa2..315bee4 100644
index c7233cb..65a9076 100644
--- a/absl/base/CMakeLists.txt
+++ b/absl/base/CMakeLists.txt
@@ -87,6 +87,12 @@ absl_cc_library(
absl::errno_saver
@@ -38,6 +38,11 @@ absl_cc_library(
COPTS
${ABSL_DEFAULT_COPTS}
)

+if (NOT EXISTS ${CMAKE_CURRENT_LIST_DIR}/options.h.in)
+ file(RENAME ${CMAKE_CURRENT_LIST_DIR}/options.h ${CMAKE_CURRENT_LIST_DIR}/options.h.in)
+endif()
+file(REMOVE ${CMAKE_CURRENT_LIST_DIR}/options.h)
+configure_file(${CMAKE_CURRENT_LIST_DIR}/options.h.in ${CMAKE_CURRENT_LIST_DIR}/options.h @ONLY)
+
absl_cc_library(
NAME
config
diff --git a/absl/base/options.h b/absl/base/options.h
index 6a0fb07..54a9780 100644
index 56b4e36..0b098ed 100644
--- a/absl/base/options.h
+++ b/absl/base/options.h
@@ -100,7 +100,7 @@
Expand Down
9 changes: 4 additions & 5 deletions ports/abseil/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,16 @@ endif()
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO abseil/abseil-cpp
REF 278e0a071885a22dcd2fd1b5576cc44757299343 #LTS 20210324, Patch 2
SHA512 a9e8e9169ebcfb8bc2eca28152ad2f655f48e6281ea932eb712333f3d0aa0b6fa1a9b184f3e2ddd75d932a54b501cc5c7bb29a1c9de5d2146f82fc5754653895
REF 215105818dfde3174fe799600bb0f3cae233d0bf #LTS 20211102, Patch 1
SHA512 75d234eac76be8790cf09e3e1144e4b4cf5cacb61e46961a9e4a35b37d0fa85243afdd5de5f47a006ef96af6fc91ecc0c233297c4c32258c08d46304b3361330
HEAD_REF master
PATCHES
# in C++17 mode, use std::any, std::optional, std::string_view, std::variant
# instead of the library replacement types
# in C++11 mode, force use of library replacement types, otherwise the automatic
# detection can cause ABI issues depending on which compiler options
# are enabled for consuming user code
fix-cxx-standard.patch
fix-32-bit-arm.patch
fix-cxx-standard.patch
)

vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
Expand Down Expand Up @@ -53,4 +52,4 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
)
endif()

file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
3 changes: 1 addition & 2 deletions ports/abseil/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"name": "abseil",
"version-string": "20210324.2",
"port-version": 1,
"version-string": "20211102.1",
"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.",
Expand Down
5 changes: 5 additions & 0 deletions versions/a-/abseil.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "962a81319706d17c9e90bd0b873659ec7c75178a",
"version-string": "20211102.1",
"port-version": 0
},
{
"git-tree": "10d137aa21adc696f8469d49f67b90ce0d50e1a1",
"version-string": "20210324.2",
Expand Down
4 changes: 2 additions & 2 deletions versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
"port-version": 3
},
"abseil": {
"baseline": "20210324.2",
"port-version": 1
"baseline": "20211102.1",
"port-version": 0
},
"absent": {
"baseline": "0.3.1",
Expand Down