From 6fdcbc5e9d2f1fbab40c78720e4b32444749c7c8 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Fri, 21 Jan 2022 20:08:38 +0100 Subject: [PATCH] [readline-unix] no absolute paths (#22421) --- ports/readline-unix/portfile.cmake | 4 +++- ports/readline-unix/vcpkg.json | 6 +++++- versions/baseline.json | 2 +- versions/r-/readline-unix.json | 5 +++++ 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/ports/readline-unix/portfile.cmake b/ports/readline-unix/portfile.cmake index 4e7db65354..b7422e53af 100644 --- a/ports/readline-unix/portfile.cmake +++ b/ports/readline-unix/portfile.cmake @@ -9,7 +9,7 @@ vcpkg_extract_source_archive(SOURCE_PATH ARCHIVE "${ARCHIVE}") vcpkg_configure_make( SOURCE_PATH "${SOURCE_PATH}" - OPTIOS + OPTIONS --with-curses=yes ) @@ -17,4 +17,6 @@ vcpkg_install_make() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +vcpkg_fixup_pkgconfig() + file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/readline-unix/vcpkg.json b/ports/readline-unix/vcpkg.json index 19866ea718..6d3b9382b6 100644 --- a/ports/readline-unix/vcpkg.json +++ b/ports/readline-unix/vcpkg.json @@ -1,6 +1,10 @@ { "name": "readline-unix", "version": "8.1", + "port-version": 1, "description": "Implementation of readline for unix", - "supports": "!windows" + "supports": "!windows", + "dependencies": [ + "ncurses" + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 94b2734f37..fa57dfa23c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6010,7 +6010,7 @@ }, "readline-unix": { "baseline": "8.1", - "port-version": 0 + "port-version": 1 }, "readline-win32": { "baseline": "5.0", diff --git a/versions/r-/readline-unix.json b/versions/r-/readline-unix.json index 479f36c565..a0284c726a 100644 --- a/versions/r-/readline-unix.json +++ b/versions/r-/readline-unix.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cc7ba8176a2492af17dc561bcb82c36f7c89e540", + "version": "8.1", + "port-version": 1 + }, { "git-tree": "e2ef4d4f472d6fe4f36009032dfdd3279a50c754", "version": "8.1",