From fadc22acfe48c456954e2e1db116df6692c0e4c2 Mon Sep 17 00:00:00 2001
From: autoantwort <41973254+autoantwort@users.noreply.github.com>
Date: Tue, 7 Dec 2021 06:13:20 +0100
Subject: [PATCH] [apr] no absolute paths (#21860)

---
 ports/apr/portfile.cmake | 4 ++++
 ports/apr/vcpkg.json     | 2 +-
 versions/a-/apr.json     | 5 +++++
 versions/baseline.json   | 2 +-
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/ports/apr/portfile.cmake b/ports/apr/portfile.cmake
index 1061497a5a..a7b81a921f 100644
--- a/ports/apr/portfile.cmake
+++ b/ports/apr/portfile.cmake
@@ -83,7 +83,11 @@ else()
     vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES pthread rt dl uuid crypt)
 
     vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/apr-1-config" "\"${CURRENT_INSTALLED_DIR}\"" "`dirname $0`/../../..")
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/apr-1-config" "APR_SOURCE_DIR=\"${SOURCE_PATH}\"" "")
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/apr-1-config" "APR_BUILD_DIR=\"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel\"" "")
     vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/apr-1-config" "\"${CURRENT_INSTALLED_DIR}/debug\"" "`dirname $0`/../../../..")
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/apr-1-config" "APR_SOURCE_DIR=\"${SOURCE_PATH}\"" "")
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/apr-1-config" "APR_BUILD_DIR=\"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg\"" "")
 endif()
 
 # Handle copyright
diff --git a/ports/apr/vcpkg.json b/ports/apr/vcpkg.json
index 67bca3b0a7..53dcc1a5ae 100644
--- a/ports/apr/vcpkg.json
+++ b/ports/apr/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "apr",
   "version": "1.7.0",
-  "port-version": 5,
+  "port-version": 6,
   "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/",
   "supports": "!uwp",
diff --git a/versions/a-/apr.json b/versions/a-/apr.json
index 9f8ee67708..87aaa252f1 100644
--- a/versions/a-/apr.json
+++ b/versions/a-/apr.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "bc5604f4ffbdcdaee979fccdb1fd5a85dfc7a3db",
+      "version": "1.7.0",
+      "port-version": 6
+    },
     {
       "git-tree": "3de94d87f5afac3e6800a26771517217d5113349",
       "version": "1.7.0",
diff --git a/versions/baseline.json b/versions/baseline.json
index b98fc0fe54..8b59d548fc 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -110,7 +110,7 @@
     },
     "apr": {
       "baseline": "1.7.0",
-      "port-version": 5
+      "port-version": 6
     },
     "apr-util": {
       "baseline": "1.6.1",