From 6a2541e6eca7734fd931ff1ded6aeee9f1ceff98 Mon Sep 17 00:00:00 2001
From: talregev <talregev@users.noreply.github.com>
Date: Thu, 19 Mar 2026 08:03:43 +0200
Subject: [PATCH] [apr] switch to vcpkg-make (#50540)

---
 ports/apr/portfile.cmake        | 4 ++--
 ports/apr/vcpkg.json            | 6 ++++++
 scripts/ci.feature.baseline.txt | 4 +++-
 versions/a-/apr.json            | 5 +++++
 versions/baseline.json          | 2 +-
 5 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/ports/apr/portfile.cmake b/ports/apr/portfile.cmake
index a8ed343b2e..28c5b3b620 100644
--- a/ports/apr/portfile.cmake
+++ b/ports/apr/portfile.cmake
@@ -70,7 +70,7 @@ else()
         message(STATUS "Configuring apr")
     endif()
     set(ENV{CFLAGS} "$ENV{CFLAGS} -Wno-error=implicit-function-declaration")
-    vcpkg_configure_make(
+    vcpkg_make_configure(
         SOURCE_PATH "${SOURCE_PATH}"
         OPTIONS
             "--prefix=${CURRENT_INSTALLED_DIR}"
@@ -79,7 +79,7 @@ else()
             "${CONFIGURE_PARAMETER_3}"
     )
 
-    vcpkg_install_make()
+    vcpkg_make_install()
 
     if(NOT VCPKG_BUILD_TYPE)
         vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/apr-1.pc"
diff --git a/ports/apr/vcpkg.json b/ports/apr/vcpkg.json
index 13c8e15caa..ae9ad19672 100644
--- a/ports/apr/vcpkg.json
+++ b/ports/apr/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "apr",
   "version": "1.7.6",
+  "port-version": 1,
   "description": "The Apache Portable Runtime (APR) is a C library that forms a system portability layer that covers many operating systems.",
   "homepage": "https://apr.apache.org/",
   "license": "Apache-2.0",
@@ -20,6 +21,11 @@
       "name": "vcpkg-cmake-config",
       "host": true,
       "platform": "windows"
+    },
+    {
+      "name": "vcpkg-make",
+      "host": true,
+      "platform": "!windows"
     }
   ],
   "features": {
diff --git a/scripts/ci.feature.baseline.txt b/scripts/ci.feature.baseline.txt
index eeaedaad2c..77e0f99269 100644
--- a/scripts/ci.feature.baseline.txt
+++ b/scripts/ci.feature.baseline.txt
@@ -86,8 +86,10 @@ ampl-asl:arm64-linux=fail
 ampl-mp:arm64-linux=cascade
 anari:arm64-linux=cascade
 appstream-glib:arm64-linux=cascade
+apr:arm-neon-android=fail
+apr:arm64-android=fail
 apr:arm64-linux=fail
-apr:arm64-windows=fail # Cross compiling CI machine cannot run gen_test_char to generate apr_escape_test_char.h
+apr:x64-android=fail
 apr-util:arm64-linux=cascade
 aravis[introspection]:arm64-windows=skip # needs arm64 host
 aravis[usb]:arm64-linux=cascade
diff --git a/versions/a-/apr.json b/versions/a-/apr.json
index 163f75ef38..3da15e9484 100644
--- a/versions/a-/apr.json
+++ b/versions/a-/apr.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "b4745579e740aac13425820fc4aed1241c0d44a7",
+      "version": "1.7.6",
+      "port-version": 1
+    },
     {
       "git-tree": "4e92a2673b91ca78ac5c9f310f2a68aa6d105770",
       "version": "1.7.6",
diff --git a/versions/baseline.json b/versions/baseline.json
index e5d7f6fd05..b638c47abc 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -198,7 +198,7 @@
     },
     "apr": {
       "baseline": "1.7.6",
-      "port-version": 0
+      "port-version": 1
     },
     "apr-util": {
       "baseline": "1.6.3",