[apr] no absolute paths (#21860)

This commit is contained in:
autoantwort 2021-12-07 06:13:20 +01:00 committed by GitHub
parent 52cb57e8ad
commit fadc22acfe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 2 deletions

View File

@ -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

View File

@ -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",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "bc5604f4ffbdcdaee979fccdb1fd5a85dfc7a3db",
"version": "1.7.0",
"port-version": 6
},
{
"git-tree": "3de94d87f5afac3e6800a26771517217d5113349",
"version": "1.7.0",

View File

@ -110,7 +110,7 @@
},
"apr": {
"baseline": "1.7.0",
"port-version": 5
"port-version": 6
},
"apr-util": {
"baseline": "1.6.1",