Merge remote-tracking branch 'Microsoft/master' into 2.7_updateApril2026

Author: JoergAtGithub

ports/abseil/001-mingw-dll.patch

@@ -0,0 +1,12 @@
+diff --git a/absl/container/CMakeLists.txt b/absl/container/CMakeLists.txt
+index 365c6ea..d12e585 100644
+--- a/absl/container/CMakeLists.txt
++++ b/absl/container/CMakeLists.txt
+@@ -1119,6 +1119,7 @@ absl_cc_library(
+     absl::config
+     absl::test_instance_tracker
+     GTest::gmock
++  TESTONLY
+ )
+ 
+ absl_cc_library(

ports/abseil/002-string-view.patch

@@ -0,0 +1,20 @@
+diff --git a/CMake/AbseilDll.cmake b/CMake/AbseilDll.cmake
+--- a/CMake/AbseilDll.cmake
++++ b/CMake/AbseilDll.cmake
+@@ -457,12 +457,14 @@ set(ABSL_INTERNAL_DLL_FILES
+   "strings/string_view.h"
+ )
+ 
+-if(MSVC)
++if(MSVC OR MINGW)
+   list(APPEND ABSL_INTERNAL_DLL_FILES
+     "time/internal/cctz/src/time_zone_name_win.cc"
+     "time/internal/cctz/src/time_zone_name_win.h"
+   )
+-else()
++endif()
++
++if(NOT MSVC)
+   list(APPEND ABSL_INTERNAL_DLL_FILES
+     "flags/commandlineflag.cc"
+     "flags/commandlineflag.h"

ports/abseil/fix-heterogeneous_lookup_testing-target.patch

@@ -6,18 +6,14 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO abseil/abseil-cpp
     REF "${VERSION}"
-    SHA512 7083b73c3cf763f6f7a7edb70a5171f44d27045a0f5e52ca043e0a86379af2c50cf85dbfea30ebaa22a7bb2929452581d26b1ba18945023b057267d4c3bad2f7
+    SHA512 f5012885d6b6844a9cf5ed92ad5468b8757db33dfe1364bfb232fff928e06c550c7eb4557f45186a8ac4d18b178df9be267681abab4a6de40823b574afbe9960
     HEAD_REF master
     PATCHES 
-        001-mingw-dll.patch # Upstreamed (not yet in a release): https://github.com/abseil/abseil-cpp/commit/f2dee57baf19ceeb6d12cf9af7cbb3c049396ba5
-        002-string-view.patch
         003-force-cxx-17.patch
+        fix-heterogeneous_lookup_testing-target.patch
+        fix-mingw-dll.patch
 )
 
-set(ABSL_TEST_HELPERS_OPTIONS "")
-if("test-helpers" IN_LIST FEATURES)
-    set(ABSL_TEST_HELPERS_OPTIONS "-DABSL_BUILD_TEST_HELPERS=ON" "-DABSL_USE_EXTERNAL_GOOGLETEST=ON" "-DABSL_FIND_GOOGLETEST=ON")
-endif()
 
 set(ABSL_STATIC_RUNTIME_OPTION "")
 if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_CRT_LINKAGE STREQUAL "static")
@@ -37,12 +33,12 @@ if(VCPKG_TARGET_IS_MINGW)
         vcpkg_list(APPEND ABSL_MINGW_OPTIONS "-DABSL_BUILD_MONOLITHIC_SHARED_LIBS=ON")
     endif()
 endif()
-
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
-    DISABLE_PARALLEL_CONFIGURE
     OPTIONS
         -DABSL_PROPAGATE_CXX_STD=ON
+        -DABSL_BUILD_TESTING=OFF 
+        -DABSL_BUILD_TEST_HELPERS=OFF
         ${ABSL_TEST_HELPERS_OPTIONS}
         ${ABSL_STATIC_RUNTIME_OPTION}
         ${ABSL_MINGW_OPTIONS}

ports/abseil/fix-mingw-dll.patch

@@ -1,6 +1,7 @@
 {
   "name": "abseil",
-  "version": "20250814.1",
+  "version": "20260107.1",
+  "port-version": 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.",
@@ -17,14 +18,5 @@
       "name": "vcpkg-cmake-config",
       "host": true
     }
-  ],
-  "features": {
-    "test-helpers": {
-      "description": "Build Abseil's test helpers",
-      "dependencies": [
-        "abseil",
-        "gtest"
-      ]
-    }
-  }
+  ]
 }

ports/abseil/portfile.cmake

@@ -20,14 +20,14 @@ else()
     vcpkg_list(APPEND options "--disable-nls")
 endif()
 
-vcpkg_configure_make(
+vcpkg_make_configure(
     SOURCE_PATH "${SOURCE_PATH}"
-    AUTOCONFIG
+    AUTORECONF
     OPTIONS
         ${options}
 )
 
-vcpkg_install_make()
+vcpkg_make_install()
 vcpkg_fixup_pkgconfig()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")

ports/abseil/vcpkg.json

@@ -1,12 +1,17 @@
 {
   "name": "acl",
   "version-semver": "2.3.2",
+  "port-version": 1,
   "description": "Commands for Manipulating POSIX Access Control Lists",
   "homepage": "https://savannah.nongnu.org/projects/acl",
   "license": "LGPL-2.1-or-later",
   "supports": "linux",
   "dependencies": [
-    "attr"
+    "attr",
+    {
+      "name": "vcpkg-make",
+      "host": true
+    }
   ],
   "features": {
     "nls": {

ports/acl/portfile.cmake

@@ -20,15 +20,15 @@ vcpkg_extract_source_archive(
 )
 
 if (VCPKG_TARGET_IS_LINUX)
-    vcpkg_configure_make(
+    vcpkg_make_configure(
         SOURCE_PATH "${SOURCE_PATH}"
-        AUTOCONFIG
+        AUTORECONF
         OPTIONS
             "--with-openssl=${CURRENT_INSTALLED_DIR}"
             "--with-apr=${CURRENT_INSTALLED_DIR}/tools/apr"
     )
 
-    vcpkg_install_make()
+    vcpkg_make_install()
 
     file(RENAME "${CURRENT_PACKAGES_DIR}/include/activemq-cpp-${VERSION}/activemq" "${CURRENT_PACKAGES_DIR}/include/activemq")
     file(RENAME "${CURRENT_PACKAGES_DIR}/include/activemq-cpp-${VERSION}/cms" "${CURRENT_PACKAGES_DIR}/include/cms")

ports/acl/vcpkg.json

@@ -1,7 +1,7 @@
 {
   "name": "activemq-cpp",
   "version-semver": "3.9.5",
-  "port-version": 17,
+  "port-version": 18,
   "description": "Apache ActiveMQ is the most popular and powerful open source messaging and Integration Patterns server.",
   "license": "Apache-2.0",
   "supports": "(windows & !uwp & (x86 | x64)) | (!windows & !osx)",
@@ -11,6 +11,11 @@
       "name": "libuuid",
       "platform": "!windows & !osx"
     },
+    {
+      "name": "vcpkg-make",
+      "host": true,
+      "platform": "linux"
+    },
     {
       "name": "vcpkg-msbuild",
       "host": true,