Signed-off-by: Ladislav Michl <la...@linux-mips.org>
---
 .../0001-teach-ncurses-config-about-sysroot.patch  | 39 +++++-----
 patches/{ncurses-5.9 => ncurses-6.1}/series        |  0
 rules/ncurses.make                                 | 87 +++++++++++-----------
 3 files changed, 61 insertions(+), 65 deletions(-)

diff --git a/patches/ncurses-5.9/0001-teach-ncurses-config-about-sysroot.patch 
b/patches/ncurses-6.1/0001-teach-ncurses-config-about-sysroot.patch
similarity index 57%
rename from patches/ncurses-5.9/0001-teach-ncurses-config-about-sysroot.patch
rename to patches/ncurses-6.1/0001-teach-ncurses-config-about-sysroot.patch
index 0730dc9af..64a0e960a 100644
--- a/patches/ncurses-5.9/0001-teach-ncurses-config-about-sysroot.patch
+++ b/patches/ncurses-6.1/0001-teach-ncurses-config-about-sysroot.patch
@@ -9,16 +9,14 @@ Signed-off-by: Marc Kleine-Budde <m...@pengutronix.de>
  misc/ncurses-config.in |   12 ++++++------
  1 files changed, 6 insertions(+), 6 deletions(-)
 
-diff --git a/misc/ncurses-config.in b/misc/ncurses-config.in
-index a9c0ac5..08d44bb 100644
---- a/misc/ncurses-config.in
-+++ b/misc/ncurses-config.in
-@@ -73,10 +73,10 @@ while test $# -gt 0; do
+--- ncurses-6.1/misc/ncurses-config.in 2017-12-09 23:45:44.000000000 +0100
++++ ncurses-6.1/misc/ncurses-config.in 2018-02-08 13:50:07.365266351 +0100
+@@ -101,21 +101,21 @@
        --cflags)
-               INCS=
+               INCS="@PKG_CFLAGS@"
                if test "x@WITH_OVERWRITE@" = xno ; then
--                      INCS="$INCS -I${includedir}/${THIS}"
-+                      INCS="$INCS -I${SYSROOT}${includedir}/${THIS}"
+-                      INCS="$INCS -I${includesubdir}"
++                      INCS="$INCS -I${SYSROOT}${includesubdir}"
                fi
 -              if test "${includedir}" != /usr/include ; then
 -                      INCS="$INCS -I${includedir}"
@@ -27,22 +25,21 @@ index a9c0ac5..08d44bb 100644
                fi
                sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO
                        $INCS
-@@ -85,11 +85,11 @@ ENDECHO
-       --libs)
-               if test @TINFO_NAME@ = @LIB_NAME@ ; then
-               sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO
--                      -L$libdir @EXTRA_LDFLAGS@ -l${THIS} @LIBS@
-+                      -L${SYSROOT}$libdir @EXTRA_LDFLAGS@ -l${THIS} @LIBS@
  ENDECHO
+               ;;
+       --libs)
+-              if test "$libdir" = /usr/lib
++              if test "${SYSROOT}$libdir" = /usr/lib
+               then
+                       LIBDIR=
                else
-               sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO
--                      -L$libdir @EXTRA_LDFLAGS@ -l${THIS} -l${TINFO_LIB} 
@LIBS@
-+                      -L${SYSROOT}$libdir @EXTRA_LDFLAGS@ -l${THIS} 
-l${TINFO_LIB} @LIBS@
- ENDECHO
+-                      LIBDIR=-L$libdir
++                      LIBDIR=-L${SYSROOT}$libdir
                fi
-               ;;
-@@ -114,7 +114,7 @@ ENDECHO
-               echo "${includedir}"
+               if test @TINFO_NAME@ = @LIB_NAME@ ; then
+               sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO
+@@ -154,7 +154,7 @@
+               echo $INCS
                ;;
        --libdir)
 -              echo "${libdir}"
diff --git a/patches/ncurses-5.9/series b/patches/ncurses-6.1/series
similarity index 100%
rename from patches/ncurses-5.9/series
rename to patches/ncurses-6.1/series
diff --git a/rules/ncurses.make b/rules/ncurses.make
index c2fcde478..40be792fb 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))
@@ -31,58 +31,57 @@ NCURSES_LICENSE_FILES       := \
 # Prepare
 # ----------------------------------------------------------------------------
 
-NCURSES_ENV := \
+NCURSES_CONF_TOOL := autoconf
+NCURSES_CONF_ENV := \
        $(CROSS_ENV) \
        TIC_PATH="$(PTXCONF_SYSROOT_HOST)/bin/tic"
-
-NCURSES_AUTOCONF_SHARED := \
-       --without-cxx-binding \
-       --disable-echo \
-       --disable-nls \
-       --enable-const \
-       --enable-overwrite \
-       --libdir=/$(CROSS_LIB_DIR) \
-       --without-debug \
-       --without-normal \
+# NOTE: reentrant enables opaque, which breaks other packages
+# pthread enables reentrant, so don't enable it either
+NCURSES_CONF_OPT := \
+       $(CROSS_AUTOCONF_USR) \
        --without-ada \
-       --without-gpm \
+       --without-cxx \
+       --without-cxx-binding \
+       --enable-db-install \
        --without-manpages \
+       --without-progs \
+       --without-tack \
        --without-tests \
+       --with-curses-h \
+       --enable-pc-files \
        --enable-mixed-case \
-       --with-ticlib=yes \
+       --without-libtool \
+       --with-shared \
+       --with-normal \
+       --without-debug \
+       --without-profile \
+       --without-cxx-shared \
+       --with-termlib \
+       --with-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 \
+       --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
-
-# 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 := \
-       $(CROSS_AUTOCONF_USR) \
-       $(NCURSES_AUTOCONF_SHARED) \
-       --with-shared \
-       --without-progs
+       --disable-reentrant \
+       --without-develop \
+       --disable-interop
 
 NCURSES_CPPFLAGS := -P
 
@@ -96,7 +95,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
+NCURSES_LIBRARY_LIST := ncurses tic tinfo
 
 ifdef PTXCONF_NCURSES_FORM
 NCURSES_LIBRARY_LIST += form
-- 
2.16.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Reply via email to