From f15cf57b238ba969890b80d703061e807aa59d2c Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Thu, 11 Nov 2021 22:37:13 +0100 Subject: [PATCH] [botan] no absolute paths (#21287) --- ports/botan/portfile.cmake | 4 ++++ ports/botan/vcpkg.json | 2 +- versions/b-/botan.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ports/botan/portfile.cmake b/ports/botan/portfile.cmake index bfc7db36e4..ab66cf2753 100644 --- a/ports/botan/portfile.cmake +++ b/ports/botan/portfile.cmake @@ -162,4 +162,8 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL static) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/botan/build.h" "#define BOTAN_INSTALL_PREFIX R\"(${CURRENT_PACKAGES_DIR})\"" "") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/botan/build.h" "#define BOTAN_INSTALL_LIB_DIR R\"(${CURRENT_PACKAGES_DIR}/lib)\"" "") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/botan/build.h" "--prefix=${CURRENT_PACKAGES_DIR}" "") + file(INSTALL "${SOURCE_PATH}/license.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/botan/vcpkg.json b/ports/botan/vcpkg.json index 01891cc6a8..1c2d7e1a30 100644 --- a/ports/botan/vcpkg.json +++ b/ports/botan/vcpkg.json @@ -1,7 +1,7 @@ { "name": "botan", "version": "2.18.1", - "port-version": 3, + "port-version": 4, "description": "A cryptography library written in C++11", "homepage": "https://botan.randombit.net", "supports": "!(windows & arm)", diff --git a/versions/b-/botan.json b/versions/b-/botan.json index 78fde90713..8e96e8fe52 100644 --- a/versions/b-/botan.json +++ b/versions/b-/botan.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "477e259691b81a016da459532f616b5fca230a91", + "version": "2.18.1", + "port-version": 4 + }, { "git-tree": "045c95bf0e7f1352d91398bc0dc41ce5ec5a288a", "version": "2.18.1", diff --git a/versions/baseline.json b/versions/baseline.json index c995460462..b8eee9ba68 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1130,7 +1130,7 @@ }, "botan": { "baseline": "2.18.1", - "port-version": 3 + "port-version": 4 }, "box2d": { "baseline": "2.4.1",