From: Hauke Mehrtens Date: Sat, 27 Jul 2024 17:29:04 +0000 (+0200) Subject: ncurses: Fix path in ncursesw.pc X-Git-Tag: v23.05.5~50 X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=461102d99cdd5e380e3b23105e69d939199ca6bc;p=openwrt%2Fstaging%2Fpepe2k.git ncurses: Fix path in ncursesw.pc The file contains the the /usr/lib path from the toolchain directory and not from the target directory. The /usr/lib directory for the toolchain is empty and the shared library is not in the specified paths. On RISCV the linker of util-linux was finding the libncursesw.so in my host system, tried to link against it and failed. Fix the .pc file. Fixes: #15942 Co-authored-by: Thomas Weißschuh Link: https://github.com/openwrt/openwrt/pull/16018 Signed-off-by: Robert Marko (cherry picked from commit 91573ac145aa70a12b0984ec75507ac648569240) Link: https://github.com/openwrt/openwrt/pull/16390 Signed-off-by: Hauke Mehrtens --- diff --git a/package/libs/ncurses/Makefile b/package/libs/ncurses/Makefile index 4d8e685f35..88ec809f01 100644 --- a/package/libs/ncurses/Makefile +++ b/package/libs/ncurses/Makefile @@ -179,6 +179,8 @@ define Build/InstallDev $(SED) 's,^\(prefix\|exec_prefix\)=.*,\1=$(STAGING_DIR)/usr,g' -e 's/$$$$INCS //g' \ $(2)/bin/ncursesw6-config ln -sf $(STAGING_DIR)/host/bin/ncursesw6-config $(1)/usr/bin/ncursesw6-config + $(SED) 's,$(TOOLCHAIN_DIR),$(STAGING_DIR),g' \ + $(1)/usr/lib/pkgconfig/ncursesw.pc endef define Host/Compile