From 749d0eef7faeb59750dd1b25b1c03c3e25df7965 Mon Sep 17 00:00:00 2001 From: Tim Schumacher Date: Sun, 8 May 2022 23:19:13 +0200 Subject: [PATCH] Ports: Install ncurses headers into the main include directory --- Ports/imgcat/package.sh | 2 -- Ports/nano/package.sh | 1 - Ports/ncurses/package.sh | 6 ++++++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Ports/imgcat/package.sh b/Ports/imgcat/package.sh index 927301c9a4..1568a9f372 100755 --- a/Ports/imgcat/package.sh +++ b/Ports/imgcat/package.sh @@ -9,5 +9,3 @@ build() { run make \ production=true } - -export CPPFLAGS="-I${SERENITY_INSTALL_ROOT}/usr/local/include/ncurses" diff --git a/Ports/nano/package.sh b/Ports/nano/package.sh index d29cce5f74..bb90293604 100755 --- a/Ports/nano/package.sh +++ b/Ports/nano/package.sh @@ -11,5 +11,4 @@ auth_type="sig" auth_import_key="BFD009061E535052AD0DF2150D28D4D2A0ACE884" auth_opts=("nano-${version}.tar.xz.asc" "nano-${version}.tar.xz") -export CPPFLAGS="-I${SERENITY_INSTALL_ROOT}/usr/local/include/ncurses" export PKG_CONFIG_PATH="${SERENITY_INSTALL_ROOT}/usr/local/lib/pkgconfig" diff --git a/Ports/ncurses/package.sh b/Ports/ncurses/package.sh index 396d22193b..3acdde2ddd 100755 --- a/Ports/ncurses/package.sh +++ b/Ports/ncurses/package.sh @@ -87,4 +87,10 @@ post_install() { # Target folder has to be removed, otherwise we will get `/usr/local/include/ncurses/ncursesw`. rm -rf "${SERENITY_INSTALL_ROOT}/usr/local/include/ncurses" ln -svf ncursesw "${SERENITY_INSTALL_ROOT}/usr/local/include/ncurses" + + # Compatibility symlink for ports that expect `/usr/local/include/curses.h` and friends. + # FIXME: Is there a logical explanation for all of this? If so, we should clean it up at some point. + for file in $(ls "${SERENITY_INSTALL_ROOT}/usr/local/include/ncursesw"); do + ln -svf ncursesw/${file} "${SERENITY_INSTALL_ROOT}/usr/local/include/${file}" + done }