diff mbox series

[OpenWrt-Devel,v2] ncurses: Add ncurses6 config

Message ID 20200309124640.24379-1-jan.kardell@telliq.com
State New
Headers show
Series [OpenWrt-Devel,v2] ncurses: Add ncurses6 config | expand

Commit Message

Jan Kardell March 9, 2020, 12:46 p.m. UTC
This is needed by gpsd. Otherwise it finds and uses the build host
version of ncurses header files. And those are not compatible, at
least not on openSUSE.

Also use relative symlinks to the ncursesw6-config file.

Signed-off-by: Jan Kardell <jan.kardell@telliq.com>
---
 package/libs/ncurses/Makefile | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/package/libs/ncurses/Makefile b/package/libs/ncurses/Makefile
index cc1e960a0c..82b274e32b 100644
--- a/package/libs/ncurses/Makefile
+++ b/package/libs/ncurses/Makefile
@@ -9,7 +9,7 @@  include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ncurses
 PKG_VERSION:=6.2
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GNU/$(PKG_NAME)
@@ -156,13 +156,16 @@  define Build/InstallDev
 			ln -s $$$${so##*/} $$$${so%w.so*}.so$$$${so##*w.so}; \
 		done; \
 	done
+	ln -s . $(1)/usr/include/ncurses
 	ln -s . $(1)/usr/include/ncursesw
 	$(TARGET_CROSS)ar rc $(1)/usr/lib/libtinfo.a
 	$(INSTALL_DIR) $(2)/bin
 	$(CP) $(PKG_INSTALL_DIR)/usr/bin/ncursesw6-config $(2)/bin/
 	$(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
+	ln -rsf $(2)/bin/ncursesw6-config $(1)/usr/bin/ncurses6-config
+	ln -rsf $(2)/bin/ncursesw6-config $(2)/bin/ncurses6-config
+	ln -rsf $(2)/bin/ncursesw6-config $(1)/usr/bin/ncursesw6-config
 endef
 
 define Host/Compile