From: Ladislav Michl <ladis@linux-mips.org>
To: ptxdist@pengutronix.de
Subject: [ptxdist] [PATCH v2 1/3] ncurses: version bump 5.9 -> 6.1
Date: Wed, 28 Feb 2018 07:57:15 +0100 [thread overview]
Message-ID: <20180228065715.GA7737@lenoch> (raw)
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>
---
Changes:
- v2: further clean up and fixes needed to build widechar and
nonwidechar packages
.../0001-teach-ncurses-config-about-sysroot.patch | 39 +++++----
patches/{ncurses-5.9 => ncurses-6.1}/series | 0
rules/host-ncurses.make | 6 +-
rules/ncurses.make | 93 +++++++++++-----------
rules/pre/ncurses.make | 16 ++--
5 files changed, 76 insertions(+), 78 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 <mkl@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/host-ncurses.make b/rules/host-ncurses.make
index c543cb4ca..06b7c3358 100644
--- a/rules/host-ncurses.make
+++ b/rules/host-ncurses.make
@@ -24,10 +24,8 @@ HOST_NCURSES_CONF_TOOL := autoconf
HOST_NCURSES_CONF_OPT = \
$(HOST_AUTOCONF) \
$(NCURSES_AUTOCONF_SHARED) \
- --without-shared \
- --without-cxx-binding
-
-HOST_NCURSES_CPPFLAGS := -P
+ --with-progs \
+ --without-shared
# ----------------------------------------------------------------------------
# Install
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)
diff --git a/rules/pre/ncurses.make b/rules/pre/ncurses.make
index d38bdebd3..89fefa8d8 100644
--- a/rules/pre/ncurses.make
+++ b/rules/pre/ncurses.make
@@ -8,27 +8,27 @@
#
# defaults
-CROSS_ENV_AC_NCURSESW5_CONFIG := no
-CROSS_ENV_AC_NCURSES5_CONFIG := no
+CROSS_ENV_AC_NCURSESW6_CONFIG := no
+CROSS_ENV_AC_NCURSES6_CONFIG := no
# modify if ncurses is enabled
ifdef PTXCONF_NCURSES
ifdef PTXCONF_NCURSES_WIDE_CHAR
-CROSS_ENV_AC_NCURSESW5_CONFIG := yes
+CROSS_ENV_AC_NCURSESW6_CONFIG := yes
endif
-CROSS_ENV_AC_NCURSES5_CONFIG := yes
+CROSS_ENV_AC_NCURSES6_CONFIG := yes
endif
CROSS_ENV_AC_NCURSES := \
- ac_cv_prog_ncurses5_config=$(CROSS_ENV_AC_NCURSES5_CONFIG) \
- ac_cv_prog_ncursesw5_config=$(CROSS_ENV_AC_NCURSESW5_CONFIG)
+ ac_cv_prog_ncurses6_config=$(CROSS_ENV_AC_NCURSES6_CONFIG) \
+ ac_cv_prog_ncursesw6_config=$(CROSS_ENV_AC_NCURSESW6_CONFIG)
CROSS_ENV_AC_NO_NCURSES := \
ac_cv_header_ncurses_h=no \
ac_cv_header_ncurses_ncurses_h=no \
ac_cv_lib_ncurses_initscr=no \
- ac_cv_prog_ncurses5_config=no \
- ac_cv_prog_ncursesw5_config=no
+ ac_cv_prog_ncurses6_config=no \
+ ac_cv_prog_ncursesw6_config=no
#
# $(call ptx/ncurses, PTXCONF_SYMBOL) returns env with ncurses hint or not
--
2.16.2
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
next reply other threads:[~2018-02-28 6:57 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-28 6:57 Ladislav Michl [this message]
2018-02-28 7:00 ` [ptxdist] [PATCH 2/3] htop: fix configure to discover ncurses6 Ladislav Michl
2018-02-28 7:02 ` [ptxdist] [PATCH v2 3/3] atop: version bump 1.24 -> 2.3.0 Ladislav Michl
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180228065715.GA7737@lenoch \
--to=ladis@linux-mips.org \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox