From 345f60f68cc2cf6920bce72b814bc4d62be9a090 Mon Sep 17 00:00:00 2001
From: Michael Olbrich <m.olbrich@pengutronix.de>
Date: Thu, 22 Feb 2018 09:07:52 +0100
Subject: [PATCH] fixup! ncurses: version bump 5.9 -> 6.1

---
 rules/ncurses.make | 54 +++++++++++++++++++++++++++++-------------------------
 1 file changed, 29 insertions(+), 25 deletions(-)

diff --git a/rules/ncurses.make b/rules/ncurses.make
index 9ff9b2f517db..ba474cbf815b 100644
--- a/rules/ncurses.make
+++ b/rules/ncurses.make
@@ -39,6 +39,7 @@ NCURSES_CONF_ENV := \
 # pthread enables reentrant, so don't enable it either
 NCURSES_CONF_OPT := \
 	$(CROSS_AUTOCONF_USR) \
+	--with-abi-version=5 \
 	--without-ada \
 	--without-cxx \
 	--without-cxx-binding \
@@ -95,7 +96,7 @@ ifdef PTXCONF_NCURSES_WIDE_CHAR
 # library even if they request for the non wide char library
 # Done by forcing the linker to use the right library instead
 #
-NCURSES_LIBRARY_LIST := ncurses tic tinfo
+NCURSES_LIBRARY_LIST := tic tinfo
 
 ifdef PTXCONF_NCURSES_FORM
 NCURSES_LIBRARY_LIST += form
@@ -120,13 +121,16 @@ ifdef PTXCONF_NCURSES_WIDE_CHAR
 # For this, the links at runtime are required
 #
 	for lib in $(NCURSES_LIBRARY_LIST); do \
-		echo "INPUT(-l$${lib}w)" > $(NCURSES_PKGDIR)/$(CROSS_LIB_DIR)/lib$${lib}.so ; \
+		echo "INPUT(-l$${lib}w)" > $(NCURSES_PKGDIR)/usr/$(CROSS_LIB_DIR)/lib$${lib}.so ; \
 	done
-	echo "INPUT(-lncursesw)" > $(NCURSES_PKGDIR)/$(CROSS_LIB_DIR)/libcurses.so
+	rm $(NCURSES_PKGDIR)/usr/$(CROSS_LIB_DIR)/libncursesw.so
+	echo "INPUT(libncursesw.so.5 -ltinfo)" > $(NCURSES_PKGDIR)/usr/$(CROSS_LIB_DIR)/libncursesw.so
 
-	ln -sf -- "ncursesw$(NCURSES_MAJOR)-config" \
-		"$(NCURSES_PKGDIR)/usr/bin/ncurses$(NCURSES_MAJOR)-config"
+	ln -sf -- "ncursesw5-config" \
+		"$(NCURSES_PKGDIR)/usr/bin/ncurses5-config"
 endif
+	echo "INPUT(libncurses$(NCURSES_WIDE).so.5 -ltinfo)" > $(NCURSES_PKGDIR)/usr/$(CROSS_LIB_DIR)/libncurses.so
+	ln -s libncurses.so $(NCURSES_PKGDIR)/usr/$(CROSS_LIB_DIR)/libcurses.so
 	@$(call touch)
 
 $(STATEDIR)/ncurses.install.post:
@@ -151,22 +155,22 @@ $(STATEDIR)/ncurses.targetinstall:
 	@$(call install_lib, ncurses, 0, 0, 0644, libncurses$(NCURSES_WIDE))
 
 ifdef PTXCONF_NCURSES_BACKWARD_COMPATIBLE_NON_WIDE_CHAR
-	@$(call install_link, ncurses, libncursesw.so.$(NCURSES_VERSION), \
-		/$(CROSS_LIB_DIR)/libncurses.so.$(NCURSES_VERSION))
-	@$(call install_link, ncurses, libncursesw.so.$(NCURSES_VERSION), \
-		/$(CROSS_LIB_DIR)/libncurses.so.$(NCURSES_MAJOR))
-	@$(call install_link, ncurses, libncursesw.so.$(NCURSES_VERSION), \
+	@$(call install_link, ncurses, libncursesw.so.5.9, \
+		/$(CROSS_LIB_DIR)/libncurses.so.5.9)
+	@$(call install_link, ncurses, libncursesw.so.5.9, \
+		/$(CROSS_LIB_DIR)/libncurses.so.5)
+	@$(call install_link, ncurses, libncursesw.so.5.9, \
 		/$(CROSS_LIB_DIR)/libncurses.so)
 endif
 
 ifdef PTXCONF_NCURSES_FORM
 	@$(call install_lib, ncurses, 0, 0, 0644, libform$(NCURSES_WIDE))
 ifdef PTXCONF_NCURSES_BACKWARD_COMPATIBLE_NON_WIDE_CHAR
-	@$(call install_link, ncurses, libformw.so.$(NCURSES_VERSION), \
-		/$(CROSS_LIB_DIR)/libform.so.$(NCURSES_VERSION))
-	@$(call install_link, ncurses, libformw.so.$(NCURSES_VERSION), \
-		/$(CROSS_LIB_DIR)/libform.so.$(NCURSES_MAJOR))
-	@$(call install_link, ncurses, libformw.so.$(NCURSES_VERSION), \
+	@$(call install_link, ncurses, libformw.so.5.9, \
+		/$(CROSS_LIB_DIR)/libform.so.5.9)
+	@$(call install_link, ncurses, libformw.so.5.9, \
+		/$(CROSS_LIB_DIR)/libform.so.5)
+	@$(call install_link, ncurses, libformw.so.5.9, \
 		/$(CROSS_LIB_DIR)/libform.so)
 endif
 endif
@@ -175,11 +179,11 @@ endif
 ifdef PTXCONF_NCURSES_MENU
 	@$(call install_lib, ncurses, 0, 0, 0644, libmenu$(NCURSES_WIDE))
 ifdef PTXCONF_NCURSES_BACKWARD_COMPATIBLE_NON_WIDE_CHAR
-	@$(call install_link, ncurses, libmenuw.so.$(NCURSES_VERSION), \
-		/$(CROSS_LIB_DIR)/libmenu.so.$(NCURSES_VERSION))
-	@$(call install_link, ncurses, libmenuw.so.$(NCURSES_VERSION), \
-		/$(CROSS_LIB_DIR)/libmenu.so.$(NCURSES_MAJOR))
-	@$(call install_link, ncurses, libmenuw.so.$(NCURSES_VERSION), \
+	@$(call install_link, ncurses, libmenuw.so.5.9, \
+		/$(CROSS_LIB_DIR)/libmenu.so.5.9)
+	@$(call install_link, ncurses, libmenuw.so.5.9, \
+		/$(CROSS_LIB_DIR)/libmenu.so.5)
+	@$(call install_link, ncurses, libmenuw.so.5.9, \
 		/$(CROSS_LIB_DIR)/libmenu.so)
 endif
 endif
@@ -188,11 +192,11 @@ endif
 ifdef PTXCONF_NCURSES_PANEL
 	@$(call install_lib, ncurses, 0, 0, 0644, libpanel$(NCURSES_WIDE))
 ifdef PTXCONF_NCURSES_BACKWARD_COMPATIBLE_NON_WIDE_CHAR
-	@$(call install_link, ncurses, libpanelw.so.$(NCURSES_VERSION), \
-		/$(CROSS_LIB_DIR)/libpanel.so.$(NCURSES_VERSION))
-	@$(call install_link, ncurses, libpanelw.so.$(NCURSES_VERSION), \
-		/$(CROSS_LIB_DIR)/libpanel.so.$(NCURSES_MAJOR))
-	@$(call install_link, ncurses, libpanelw.so.$(NCURSES_VERSION), \
+	@$(call install_link, ncurses, libpanelw.so.5.9, \
+		/$(CROSS_LIB_DIR)/libpanel.so.5.9)
+	@$(call install_link, ncurses, libpanelw.so.5.9, \
+		/$(CROSS_LIB_DIR)/libpanel.so.5)
+	@$(call install_link, ncurses, libpanelw.so.5.9, \
 		/$(CROSS_LIB_DIR)/libpanel.so)
 endif
 endif
-- 
2.16.1