[abseil] Bump to 20230802.0 (#33099)

* [abseil] Bump to 20230802.0 * update version database * apply suggestions * update version database
microsoft · Aug 11, 2023 · d36252e · d36252e
1 parent a6054cc
commit d36252e
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 80 deletions.
diff --git a/ports/abseil/core-foundation-deps.patch b/ports/abseil/core-foundation-deps.patch
diff --git a/ports/abseil/fix-dll-support.patch b/ports/abseil/fix-dll-support.patch
diff --git a/ports/abseil/portfile.cmake b/ports/abseil/portfile.cmake
@@ -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")
diff --git a/ports/abseil/vcpkg.json b/ports/abseil/vcpkg.json
@@ -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.",

diff --git a/versions/a-/abseil.json b/versions/a-/abseil.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "95cfb844950f2cc3e1a530bd23967ee2ea218f74",
+      "version": "20230802.0",
+      "port-version": 0
+    },
     {
       "git-tree": "370a6da6fa1c5e259a8c8deec863e705aa423be6",
       "version": "20230125.3",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -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",