From 9ab9880238b97cc7281ca6a219c5af70aa5215f4 Mon Sep 17 00:00:00 2001
From: autoantwort <41973254+autoantwort@users.noreply.github.com>
Date: Mon, 18 Jul 2022 22:14:05 +0200
Subject: [PATCH] [apr] no absolute paths (#25816)

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

diff --git a/ports/apr/portfile.cmake b/ports/apr/portfile.cmake
index 924d6ee7fc..b6970da101 100644
--- a/ports/apr/portfile.cmake
+++ b/ports/apr/portfile.cmake
@@ -75,10 +75,15 @@ else()
     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}/build-1/libtool" "${CURRENT_INSTALLED_DIR}/lib" "")
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/build-1/libtool" "${CURRENT_INSTALLED_DIR}/debug/lib" "")
     if(NOT VCPKG_BUILD_TYPE)
         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\"" "")
+
+        vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/build-1/libtool" "${CURRENT_INSTALLED_DIR}/lib" "")
+        vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/build-1/libtool" "${CURRENT_INSTALLED_DIR}/debug/lib" "")
     endif()
     file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 endif()
diff --git a/ports/apr/vcpkg.json b/ports/apr/vcpkg.json
index f8efdea9b9..e5d1ab75d6 100644
--- a/ports/apr/vcpkg.json
+++ b/ports/apr/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "apr",
   "version": "1.7.0",
-  "port-version": 9,
+  "port-version": 10,
   "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",
diff --git a/versions/a-/apr.json b/versions/a-/apr.json
index 63a44a486e..82e10c5cc0 100644
--- a/versions/a-/apr.json
+++ b/versions/a-/apr.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "7b9002157134602da80c38b7eda863fd9e0012da",
+      "version": "1.7.0",
+      "port-version": 10
+    },
     {
       "git-tree": "419034d960a2d9d932f18154e386d1ce4947d514",
       "version": "1.7.0",
diff --git a/versions/baseline.json b/versions/baseline.json
index 9367bd2d7f..419e317f84 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -118,7 +118,7 @@
     },
     "apr": {
       "baseline": "1.7.0",
-      "port-version": 9
+      "port-version": 10
     },
     "apr-util": {
       "baseline": "1.6.1",