From cd57207772a2e59f3529382c738c9bb11e643f28 Mon Sep 17 00:00:00 2001 From: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> Date: Thu, 25 Apr 2024 06:13:32 -0700 Subject: [PATCH] [abseil] Update to 20240116.2 (#38379) Update `abseil` to 20240116.2. - [x] Changes comply with the [maintainer guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md). - [x] SHA512s are updated for each updated download. - [ ] ~~The "supports" clause reflects platforms that may be fixed by this new version.~~ - [ ] ~~Any fixed [CI baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt) entries are removed from that file.~~ - [ ] ~~Any patches that are no longer applied are deleted from the port's directory.~~ - [x] The version database is fixed by rerunning `./vcpkg x-add-version --all` and committing the result. - [x] Only one version is added to each modified port's versions file. Feature passed with following triplets: ``` x86-windows x64-windows x64-windows-static ``` Usage test passed on `x64-windows`. --------- Co-authored-by: Lily Wang --- ports/abseil/portfile.cmake | 6 ++++-- ports/abseil/vcpkg.json | 3 +-- versions/a-/abseil.json | 5 +++++ versions/baseline.json | 4 ++-- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/ports/abseil/portfile.cmake b/ports/abseil/portfile.cmake index 5b48dd025d..3e0a84747a 100644 --- a/ports/abseil/portfile.cmake +++ b/ports/abseil/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO abseil/abseil-cpp REF "${VERSION}" - SHA512 41504899ac4fd4a6eaa0a5fdf27a7765ec81962fb99b6a07982ceed32c5289e9eb12206c83a70fd44c5c3e1b96c2bfa160eb12f1dbbb45f1109d632c7690de90 + SHA512 5062e731ee8c9a757e6d75fc1c558652deb4dd1daab4d6143f7ad52a139501c61365f89acbf82480be0f9a4911a58286560068d8b1a8b6774e6afad51739766e HEAD_REF master ) @@ -26,7 +26,9 @@ endif () vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE - OPTIONS -DABSL_PROPAGATE_CXX_STD=ON ${ABSL_USE_CXX17_OPTION} + OPTIONS + -DABSL_PROPAGATE_CXX_STD=ON + ${ABSL_USE_CXX17_OPTION} ) vcpkg_cmake_install() diff --git a/ports/abseil/vcpkg.json b/ports/abseil/vcpkg.json index 2749d4f1ec..9c41ed17cd 100644 --- a/ports/abseil/vcpkg.json +++ b/ports/abseil/vcpkg.json @@ -1,7 +1,6 @@ { "name": "abseil", - "version": "20240116.1", - "port-version": 1, + "version": "20240116.2", "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.", diff --git a/versions/a-/abseil.json b/versions/a-/abseil.json index 3494a129f1..eced844436 100644 --- a/versions/a-/abseil.json +++ b/versions/a-/abseil.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9af16c8547b0a3d6c5886384b9b18934353c9d6d", + "version": "20240116.2", + "port-version": 0 + }, { "git-tree": "948d23db90b120245e93ea7c0f0b773039d2aedd", "version": "20240116.1", diff --git a/versions/baseline.json b/versions/baseline.json index 4b51ccfae0..9fe0e33d20 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -17,8 +17,8 @@ "port-version": 0 }, "abseil": { - "baseline": "20240116.1", - "port-version": 1 + "baseline": "20240116.2", + "port-version": 0 }, "absent": { "baseline": "0.3.1",