aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorxyb <xyb@xyb.name>2021-03-15 15:18:10 -0700
committerGitHub <noreply@github.com>2021-03-15 15:18:10 -0700
commit44d235f7eee53f765578fdee3d340eb46c49ef81 (patch)
treee22b5ae5da8c90421969f596935ebd0c92b233f7
parentfced4bef1606260f110d74de1ae1975c2b9ac549 (diff)
downloadvcpkg-44d235f7eee53f765578fdee3d340eb46c49ef81.tar.gz
vcpkg-44d235f7eee53f765578fdee3d340eb46c49ef81.zip
[abseil] Upgrade to 20200923 patch 3, fix gcc11 build error (#16664)
-rw-r--r--ports/abseil/portfile.cmake4
-rw-r--r--ports/abseil/vcpkg.json2
-rw-r--r--versions/a-/abseil.json5
-rw-r--r--versions/baseline.json2
4 files changed, 9 insertions, 4 deletions
diff --git a/ports/abseil/portfile.cmake b/ports/abseil/portfile.cmake
index c55516c71..18152c83a 100644
--- a/ports/abseil/portfile.cmake
+++ b/ports/abseil/portfile.cmake
@@ -5,8 +5,8 @@ endif()
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO abseil/abseil-cpp
- REF 0f3bb466b868b523cf1dc9b2aaaed65c77b28862 #LTS 20200923, Patch 2
- SHA512 17e766a2f7a655a3877eb3accc5745a910b69a5e2426b7ce7f6d31095523dd32d48a709c5f8380488b4cb93ce9faadedc08f0481dbdbd00cf68831541d724b4d
+ REF 6f9d96a1f41439ac172ee2ef7ccd8edf0e5d068c #LTS 20200923, Patch 3
+ SHA512 f64fee62863f2103c1991136fd3bc2b71cd28c7ff62138ac991b5a7f81780a05e0e2bdd6a119d02e1d70dd54f989f584093957efaec94f26c9d6c3f4ee37f8ae
HEAD_REF master
PATCHES
# in C++17 mode, use std::any, std::optional, std::string_view, std::variant
diff --git a/ports/abseil/vcpkg.json b/ports/abseil/vcpkg.json
index ae89f63e6..05cbe69ea 100644
--- a/ports/abseil/vcpkg.json
+++ b/ports/abseil/vcpkg.json
@@ -1,7 +1,7 @@
{
"name": "abseil",
"version-string": "2020-09-23",
- "port-version": 2,
+ "port-version": 3,
"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.",
diff --git a/versions/a-/abseil.json b/versions/a-/abseil.json
index 9ca729f8a..ca9715ee1 100644
--- a/versions/a-/abseil.json
+++ b/versions/a-/abseil.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "184230b7622b1be5630f893dcecdaac7acde101f",
+ "version-string": "2020-09-23",
+ "port-version": 3
+ },
+ {
"git-tree": "1558fdc71dd0f0988cd2a53ba439bed3cc899247",
"version-string": "2020-09-23",
"port-version": 2
diff --git a/versions/baseline.json b/versions/baseline.json
index 05875f503..4228b71f9 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -10,7 +10,7 @@
},
"abseil": {
"baseline": "2020-09-23",
- "port-version": 2
+ "port-version": 3
},
"absent": {
"baseline": "0.3.1",