ncurses: version bump 5.9 -> 6.1

Wih update to ncurses-6.1 also:
- sort configure options the way they appear in configure to make
  future reviews easies
- as C++ code is not built remove CPPFLAGS

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

1 files changed, 48 insertions, 45 deletions

diff --git a/rules/ncurses.make b/rules/ncurses.make
index c2fcde478..d1216eb39 100644
--- a/rules/ncurses.make
+++ b/rules/ncurses.make
@@ -15,9 +15,9 @@ PACKAGES-$(PTXCONF_NCURSES) += ncurses
 #
 # Paths and names
 #
-NCURSES_VERSION	:= 5.9
+NCURSES_VERSION	:= 6.1
 NCURSES_MAJOR	:= $(word 1,$(subst ., ,$(NCURSES_VERSION)))
-NCURSES_MD5	:= 8cb9c412e5f2d96bc6f459aa8c6282a1
+NCURSES_MD5	:= 98c889aaf8d23910d2b92d65be2e737a
 NCURSES		:= ncurses-$(NCURSES_VERSION)
 NCURSES_SUFFIX	:= tar.gz
 NCURSES_URL	:= $(call ptx/mirror, GNU, ncurses/$(NCURSES).$(NCURSES_SUFFIX))
@@ -25,66 +25,69 @@ NCURSES_SOURCE	:= $(SRCDIR)/$(NCURSES).$(NCURSES_SUFFIX)
 NCURSES_DIR	:= $(BUILDDIR)/$(NCURSES)
 NCURSES_LICENSE	:= MIT
 NCURSES_LICENSE_FILES	:= \
-	file://include/curses.h.in;startline=2;endline=26;md5=3d0f6ef3745ae794471d5c62b7deb9c3
+	file://include/curses.h.in;startline=2;endline=26;md5=12de1a79061c9246decc146201452dc5
 
 # ----------------------------------------------------------------------------
 # Prepare
 # ----------------------------------------------------------------------------
 
-NCURSES_ENV := \
+NCURSES_CONF_TOOL := autoconf
+NCURSES_CONF_ENV := \
 	$(CROSS_ENV) \
-	TIC_PATH="$(PTXCONF_SYSROOT_HOST)/bin/tic"
+	TIC_PATH="$(PTXDIST_SYSROOT_HOST)/bin/tic"
 
+# NOTE: reentrant enables opaque, which breaks other packages
+# pthread enables reentrant, so don't enable it either
 NCURSES_AUTOCONF_SHARED := \
-	--without-cxx-binding \
-	--disable-echo \
-	--disable-nls \
-	--enable-const \
-	--enable-overwrite \
-	--libdir=/$(CROSS_LIB_DIR) \
-	--without-debug \
-	--without-normal \
 	--without-ada \
-	--without-gpm \
+	--without-cxx \
+	--without-cxx-binding \
+	--enable-db-install \
 	--without-manpages \
+	--without-tack \
 	--without-tests \
+	--with-curses-h \
+	--with-pkg-config-libdir=/usr/lib/pkgconfig \
+	--enable-pc-files \
 	--enable-mixed-case \
-	--with-ticlib=yes \
+	--without-libtool \
+	--with-normal \
+	--without-debug \
+	--without-profile \
+	--without-cxx-shared \
+	--without-termlib \
+	--without-ticlib \
+	--without-gpm \
+	--without-dlsym \
+	--without-sysmouse \
+	--disable-rpath \
 	--disable-relink \
+	--disable-rpath-hack \
+	--enable-overwrite \
+	--$(call ptx/endis,PTXCONF_NCURSES_BIG_CORE)-big-core \
 	--disable-big-strings \
-	--disable-sp-funcs \
+	--$(call ptx/endis,PTXCONF_NCURSES_WIDE_CHAR)-widec \
+	$(GLOBAL_LARGE_FILE_OPTION) \
+	--enable-ext-funcs \
+	--enable-sp-funcs \
 	--disable-term-driver \
+	--enable-const \
+	--enable-ext-colors \
 	--disable-ext-mouse \
-	--disable-interop \
-	--disable-rpath \
-	--disable-rpath-hack \
-	--disable-ext-colors \
+	--disable-ext-putwin \
+	--disable-no-padding \
+	--disable-signed-char \
+	--disable-sigwinch \
 	--without-pthread \
-	--disable-reentrant
-
-# NOTE: reentrant enables opaque, which breaks other packages
-# pthread enables reentrant, so don't enable it either
+	--disable-reentrant \
+	--without-develop \
+	--disable-interop
 
-# enable wide char support on demand only
-ifdef PTXCONF_NCURSES_WIDE_CHAR
-NCURSES_AUTOCONF_SHARED += --enable-widec
-else
-NCURSES_AUTOCONF_SHARED += --disable-widec
-endif
-
-ifdef PTXCONF_NCURSES_BIG_CORE
-NCURSES_AUTOCONF_SHARED += --enable-big-core
-else
-NCURSES_AUTOCONF_SHARED += --disable-big-core
-endif
-
-NCURSES_AUTOCONF := \
+NCURSES_CONF_OPT := \
 	$(CROSS_AUTOCONF_USR) \
 	$(NCURSES_AUTOCONF_SHARED) \
-	--with-shared \
-	--without-progs
-
-NCURSES_CPPFLAGS := -P
+	--without-progs \
+	--with-shared
 
 # ----------------------------------------------------------------------------
 # Install
@@ -120,12 +123,12 @@ ifdef PTXCONF_NCURSES_WIDE_CHAR
 # Already built applications may continue to use the non wide library!
 # For this, the links at runtime are required
 #
-	for lib in $(NCURSES_LIBRARY_LIST); do \
+	@for lib in $(NCURSES_LIBRARY_LIST); do \
 		echo "INPUT(-l$${lib}w)" > $(NCURSES_PKGDIR)/$(CROSS_LIB_DIR)/lib$${lib}.so ; \
 	done
-	echo "INPUT(-lncursesw)" > $(NCURSES_PKGDIR)/$(CROSS_LIB_DIR)/libcurses.so
+	@echo "INPUT(-lncursesw)" > $(NCURSES_PKGDIR)/$(CROSS_LIB_DIR)/libcurses.so
 
-	ln -sf -- "ncursesw$(NCURSES_MAJOR)-config" \
+	@ln -sf "ncursesw$(NCURSES_MAJOR)-config" \
 		"$(NCURSES_PKGDIR)/usr/bin/ncurses$(NCURSES_MAJOR)-config"
 endif
 	@$(call touch)