* [ptxdist] [PATCH 0/4] Bring ncurses to year 2018
@ 2018-02-09 14:12 Ladislav Michl
2018-02-09 14:14 ` [ptxdist] [PATCH 1/4] ncurses: version bump 5.9 -> 6.1 Ladislav Michl
` (3 more replies)
0 siblings, 4 replies; 17+ messages in thread
From: Ladislav Michl @ 2018-02-09 14:12 UTC (permalink / raw)
To: ptxdist
Let PTXdist make a use of last 7 years of ncurses development
upgrading it to version 6.1.
Unfortunately almost all ncurses dependant packages I'm using
broke after upgrade, so fix them as well - mostly upgrades.
Please give it a try and let me know about any breakage it caused
in your projects. I'll be out of office next week, but will have
a look as soon as I'll return.
Thank you.
Ladislav Michl (4):
ncurses: version bump 5.9 -> 6.1
dialog: version bump 1.1 -> 1.3
atop: version bump 1.24 -> 2.3.0
less: check for ltinfo
.../0001-teach-ncurses-config-about-sysroot.patch | 39 +++++-----
patches/{ncurses-5.9 => ncurses-6.1}/series | 0
rules/atop.make | 15 +++-
rules/dialog.make | 6 +-
rules/less.make | 1 -
rules/ncurses.make | 87 +++++++++++-----------
6 files changed, 75 insertions(+), 73 deletions(-)
rename patches/{ncurses-5.9 => ncurses-6.1}/0001-teach-ncurses-config-about-sysroot.patch (57%)
rename patches/{ncurses-5.9 => ncurses-6.1}/series (100%)
--
2.16.1
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 17+ messages in thread
* [ptxdist] [PATCH 1/4] ncurses: version bump 5.9 -> 6.1
2018-02-09 14:12 [ptxdist] [PATCH 0/4] Bring ncurses to year 2018 Ladislav Michl
@ 2018-02-09 14:14 ` Ladislav Michl
2018-02-12 13:22 ` Michael Olbrich
2018-02-22 8:12 ` Michael Olbrich
2018-02-09 14:14 ` [ptxdist] [PATCH 2/4] dialog: version bump 1.1 -> 1.3 Ladislav Michl
` (2 subsequent siblings)
3 siblings, 2 replies; 17+ messages in thread
From: Ladislav Michl @ 2018-02-09 14:14 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Ladislav Michl <ladis@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 <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/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
^ permalink raw reply [flat|nested] 17+ messages in thread
* [ptxdist] [PATCH 2/4] dialog: version bump 1.1 -> 1.3
2018-02-09 14:12 [ptxdist] [PATCH 0/4] Bring ncurses to year 2018 Ladislav Michl
2018-02-09 14:14 ` [ptxdist] [PATCH 1/4] ncurses: version bump 5.9 -> 6.1 Ladislav Michl
@ 2018-02-09 14:14 ` Ladislav Michl
2018-02-14 7:49 ` Michael Olbrich
2018-02-09 14:15 ` [ptxdist] [PATCH 3/4] atop: version bump 1.24 -> 2.3.0 Ladislav Michl
2018-02-09 14:15 ` [ptxdist] [PATCH 4/4] less: check for tgoto Ladislav Michl
3 siblings, 1 reply; 17+ messages in thread
From: Ladislav Michl @ 2018-02-09 14:14 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
---
rules/dialog.make | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/rules/dialog.make b/rules/dialog.make
index 1eb971e13..38ce2f791 100644
--- a/rules/dialog.make
+++ b/rules/dialog.make
@@ -16,11 +16,11 @@ PACKAGES-$(PTXCONF_DIALOG) += dialog
#
# Paths and names
#
-DIALOG_VERSION := 1.1-20100428
-DIALOG_MD5 := 519c0a0cbac28ddb992111ec2c3f82aa
+DIALOG_VERSION := 1.3-20171209
+DIALOG_MD5 := f66f28beca900b54f5fc90fdcce93508
DIALOG := dialog-$(DIALOG_VERSION)
DIALOG_SUFFIX := tgz
-DIALOG_URL := ftp://invisible-island.net/dialog/$(DIALOG).$(DIALOG_SUFFIX)
+DIALOG_URL := ftp://ftp.invisible-island.net/dialog/$(DIALOG).$(DIALOG_SUFFIX)
DIALOG_SOURCE := $(SRCDIR)/$(DIALOG).$(DIALOG_SUFFIX)
DIALOG_DIR := $(BUILDDIR)/$(DIALOG)
DIALOG_LICENSE := LGPL-2.1
--
2.16.1
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 17+ messages in thread
* [ptxdist] [PATCH 3/4] atop: version bump 1.24 -> 2.3.0
2018-02-09 14:12 [ptxdist] [PATCH 0/4] Bring ncurses to year 2018 Ladislav Michl
2018-02-09 14:14 ` [ptxdist] [PATCH 1/4] ncurses: version bump 5.9 -> 6.1 Ladislav Michl
2018-02-09 14:14 ` [ptxdist] [PATCH 2/4] dialog: version bump 1.1 -> 1.3 Ladislav Michl
@ 2018-02-09 14:15 ` Ladislav Michl
2018-02-14 7:50 ` Michael Olbrich
2018-02-09 14:15 ` [ptxdist] [PATCH 4/4] less: check for tgoto Ladislav Michl
3 siblings, 1 reply; 17+ messages in thread
From: Ladislav Michl @ 2018-02-09 14:15 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
---
rules/atop.make | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/rules/atop.make b/rules/atop.make
index bd9b326d0..9fa9de0f3 100644
--- a/rules/atop.make
+++ b/rules/atop.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_ATOP) += atop
#
# Paths and names
#
-ATOP_VERSION := 1.24
-ATOP_MD5 := 46522f7da28460e810e193ab46907af9
+ATOP_VERSION := 2.3.0
+ATOP_MD5 := 48e1dbef8c7d826e68829a8d5fc920fc
ATOP := atop-$(ATOP_VERSION)
ATOP_URL := http://www.atoptool.nl/download/$(ATOP).tar.gz
ATOP_SOURCE := $(SRCDIR)/$(ATOP).tar.gz
@@ -30,8 +30,15 @@ ATOP_LICENSE_FILES := file://COPYING;md5=393a5ca445f6965873eca0259a17f833
# Prepare
# ----------------------------------------------------------------------------
-ATOP_CONF_TOOL := NO
-ATOP_COMPILE_ENV := $(CROSS_ENV)
+ATOP_CONF_TOOL := NO
+# ncurses6 puts 'cbreak()' into separate tinfo library
+ATOP_MAKE_OPT := \
+ $(CROSS_ENV) \
+ LDFLAGS="-ltinfo"
+ATOP_INSTALL_OPT := \
+ $(ATOP_MAKE_OPT) \
+ DESTDIR=$(ATOP_PKGDIR) \
+ genericinstall
# ----------------------------------------------------------------------------
# Target-Install
--
2.16.1
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 17+ messages in thread
* [ptxdist] [PATCH 4/4] less: check for tgoto
2018-02-09 14:12 [ptxdist] [PATCH 0/4] Bring ncurses to year 2018 Ladislav Michl
` (2 preceding siblings ...)
2018-02-09 14:15 ` [ptxdist] [PATCH 3/4] atop: version bump 1.24 -> 2.3.0 Ladislav Michl
@ 2018-02-09 14:15 ` Ladislav Michl
3 siblings, 0 replies; 17+ messages in thread
From: Ladislav Michl @ 2018-02-09 14:15 UTC (permalink / raw)
To: ptxdist
Do not disable check for tgoto as it causes configure failure
with ncurses-6.1
Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
---
rules/less.make | 1 -
1 file changed, 1 deletion(-)
diff --git a/rules/less.make b/rules/less.make
index ff9fbd179..714864713 100644
--- a/rules/less.make
+++ b/rules/less.make
@@ -31,7 +31,6 @@ LESS_LICENSE := GPL-3.0+ AND BSD-2-Clause
LESS_CONF_ENV := \
$(CROSS_ENV) \
- ac_cv_lib_tinfo_tgoto=no \
ac_cv_lib_xcurses_initscr=no \
ac_cv_lib_ncursesw_initscr=$(call ptx/ifdef,PTXCONF_LESS_NCURSESW,yes,no) \
ac_cv_lib_ncurses_initscr=$(call ptx/ifdef,PTXCONF_LESS_NCURSES,yes,no) \
--
2.16.1
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [ptxdist] [PATCH 1/4] ncurses: version bump 5.9 -> 6.1
2018-02-09 14:14 ` [ptxdist] [PATCH 1/4] ncurses: version bump 5.9 -> 6.1 Ladislav Michl
@ 2018-02-12 13:22 ` Michael Olbrich
2018-02-12 13:42 ` Ladislav Michl
2018-02-22 8:12 ` Michael Olbrich
1 sibling, 1 reply; 17+ messages in thread
From: Michael Olbrich @ 2018-02-12 13:22 UTC (permalink / raw)
To: ptxdist
On Fri, Feb 09, 2018 at 03:14:19PM +0100, Ladislav Michl wrote:
> Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
The md5 in NCURSES_LICENSE_FILES does not match any more.
And building vim with this fails with:
[...]
checking --with-tlib argument... ncurses
checking for linking with ncurses library... OK
checking for tgetent()... configure: error: NOT FOUND!
You need to install a terminal library; for example ncurses.
Or specify the name of the library with --with-tlib.
[...]
Michael
> ---
> .../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 <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/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
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [ptxdist] [PATCH 1/4] ncurses: version bump 5.9 -> 6.1
2018-02-12 13:22 ` Michael Olbrich
@ 2018-02-12 13:42 ` Ladislav Michl
2018-02-12 14:28 ` Michael Olbrich
0 siblings, 1 reply; 17+ messages in thread
From: Ladislav Michl @ 2018-02-12 13:42 UTC (permalink / raw)
To: ptxdist
On Mon, Feb 12, 2018 at 02:22:01PM +0100, Michael Olbrich wrote:
> On Fri, Feb 09, 2018 at 03:14:19PM +0100, Ladislav Michl wrote:
> > Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
>
> The md5 in NCURSES_LICENSE_FILES does not match any more.
Will update in v2.
> And building vim with this fails with:
> [...]
> checking --with-tlib argument... ncurses
> checking for linking with ncurses library... OK
> checking for tgetent()... configure: error: NOT FOUND!
> You need to install a terminal library; for example ncurses.
> Or specify the name of the library with --with-tlib.
> [...]
I gave it a quick try with patch bellow and it compiled fine:
diff --git a/rules/vim.make b/rules/vim.make
index 6afcc78e0..7fbc15457 100644
--- a/rules/vim.make
+++ b/rules/vim.make
@@ -81,6 +81,10 @@ VIM_CONF_OPT := \
--without-x \
--with-tlib=ncurses
+VIM_MAKE_OPT := \
+ $(CROSS_ENV) \
+ LDFLAGS="-ltinfo"
+
VIM_INSTALL_OPT := \
installvimbin \
installrtbase \
Is it worth trying to fix it systemwide or we just wait until packages get
fixed over time?
ladis
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [ptxdist] [PATCH 1/4] ncurses: version bump 5.9 -> 6.1
2018-02-12 13:42 ` Ladislav Michl
@ 2018-02-12 14:28 ` Michael Olbrich
0 siblings, 0 replies; 17+ messages in thread
From: Michael Olbrich @ 2018-02-12 14:28 UTC (permalink / raw)
To: ptxdist
On Mon, Feb 12, 2018 at 02:42:48PM +0100, Ladislav Michl wrote:
> On Mon, Feb 12, 2018 at 02:22:01PM +0100, Michael Olbrich wrote:
> > On Fri, Feb 09, 2018 at 03:14:19PM +0100, Ladislav Michl wrote:
> > > Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
> >
> > The md5 in NCURSES_LICENSE_FILES does not match any more.
>
> Will update in v2.
>
> > And building vim with this fails with:
> > [...]
> > checking --with-tlib argument... ncurses
> > checking for linking with ncurses library... OK
> > checking for tgetent()... configure: error: NOT FOUND!
> > You need to install a terminal library; for example ncurses.
> > Or specify the name of the library with --with-tlib.
> > [...]
>
> I gave it a quick try with patch bellow and it compiled fine:
>
> diff --git a/rules/vim.make b/rules/vim.make
> index 6afcc78e0..7fbc15457 100644
> --- a/rules/vim.make
> +++ b/rules/vim.make
> @@ -81,6 +81,10 @@ VIM_CONF_OPT := \
> --without-x \
> --with-tlib=ncurses
>
> +VIM_MAKE_OPT := \
> + $(CROSS_ENV) \
> + LDFLAGS="-ltinfo"
> +
> VIM_INSTALL_OPT := \
> installvimbin \
> installrtbase \
Hmmm, this should not help. Ther failure I got is in the prepare stage.
Michael
> Is it worth trying to fix it systemwide or we just wait until packages get
> fixed over time?
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [ptxdist] [PATCH 2/4] dialog: version bump 1.1 -> 1.3
2018-02-09 14:14 ` [ptxdist] [PATCH 2/4] dialog: version bump 1.1 -> 1.3 Ladislav Michl
@ 2018-02-14 7:49 ` Michael Olbrich
0 siblings, 0 replies; 17+ messages in thread
From: Michael Olbrich @ 2018-02-14 7:49 UTC (permalink / raw)
To: ptxdist
On Fri, Feb 09, 2018 at 03:14:44PM +0100, Ladislav Michl wrote:
> Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
You forgot the patches of the old version.
Michael
> ---
> rules/dialog.make | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/rules/dialog.make b/rules/dialog.make
> index 1eb971e13..38ce2f791 100644
> --- a/rules/dialog.make
> +++ b/rules/dialog.make
> @@ -16,11 +16,11 @@ PACKAGES-$(PTXCONF_DIALOG) += dialog
> #
> # Paths and names
> #
> -DIALOG_VERSION := 1.1-20100428
> -DIALOG_MD5 := 519c0a0cbac28ddb992111ec2c3f82aa
> +DIALOG_VERSION := 1.3-20171209
> +DIALOG_MD5 := f66f28beca900b54f5fc90fdcce93508
> DIALOG := dialog-$(DIALOG_VERSION)
> DIALOG_SUFFIX := tgz
> -DIALOG_URL := ftp://invisible-island.net/dialog/$(DIALOG).$(DIALOG_SUFFIX)
> +DIALOG_URL := ftp://ftp.invisible-island.net/dialog/$(DIALOG).$(DIALOG_SUFFIX)
> DIALOG_SOURCE := $(SRCDIR)/$(DIALOG).$(DIALOG_SUFFIX)
> DIALOG_DIR := $(BUILDDIR)/$(DIALOG)
> DIALOG_LICENSE := LGPL-2.1
> --
> 2.16.1
>
>
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [ptxdist] [PATCH 3/4] atop: version bump 1.24 -> 2.3.0
2018-02-09 14:15 ` [ptxdist] [PATCH 3/4] atop: version bump 1.24 -> 2.3.0 Ladislav Michl
@ 2018-02-14 7:50 ` Michael Olbrich
0 siblings, 0 replies; 17+ messages in thread
From: Michael Olbrich @ 2018-02-14 7:50 UTC (permalink / raw)
To: ptxdist
On Fri, Feb 09, 2018 at 03:15:07PM +0100, Ladislav Michl wrote:
> Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
You forgot the patches of the old version.
Michael
> ---
> rules/atop.make | 15 +++++++++++----
> 1 file changed, 11 insertions(+), 4 deletions(-)
>
> diff --git a/rules/atop.make b/rules/atop.make
> index bd9b326d0..9fa9de0f3 100644
> --- a/rules/atop.make
> +++ b/rules/atop.make
> @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_ATOP) += atop
> #
> # Paths and names
> #
> -ATOP_VERSION := 1.24
> -ATOP_MD5 := 46522f7da28460e810e193ab46907af9
> +ATOP_VERSION := 2.3.0
> +ATOP_MD5 := 48e1dbef8c7d826e68829a8d5fc920fc
> ATOP := atop-$(ATOP_VERSION)
> ATOP_URL := http://www.atoptool.nl/download/$(ATOP).tar.gz
> ATOP_SOURCE := $(SRCDIR)/$(ATOP).tar.gz
> @@ -30,8 +30,15 @@ ATOP_LICENSE_FILES := file://COPYING;md5=393a5ca445f6965873eca0259a17f833
> # Prepare
> # ----------------------------------------------------------------------------
>
> -ATOP_CONF_TOOL := NO
> -ATOP_COMPILE_ENV := $(CROSS_ENV)
> +ATOP_CONF_TOOL := NO
> +# ncurses6 puts 'cbreak()' into separate tinfo library
> +ATOP_MAKE_OPT := \
> + $(CROSS_ENV) \
> + LDFLAGS="-ltinfo"
> +ATOP_INSTALL_OPT := \
> + $(ATOP_MAKE_OPT) \
> + DESTDIR=$(ATOP_PKGDIR) \
> + genericinstall
>
> # ----------------------------------------------------------------------------
> # Target-Install
> --
> 2.16.1
>
>
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [ptxdist] [PATCH 1/4] ncurses: version bump 5.9 -> 6.1
2018-02-09 14:14 ` [ptxdist] [PATCH 1/4] ncurses: version bump 5.9 -> 6.1 Ladislav Michl
2018-02-12 13:22 ` Michael Olbrich
@ 2018-02-22 8:12 ` Michael Olbrich
2018-02-22 8:17 ` Michael Olbrich
2018-02-22 9:53 ` Ladislav Michl
1 sibling, 2 replies; 17+ messages in thread
From: Michael Olbrich @ 2018-02-22 8:12 UTC (permalink / raw)
To: Ladislav Michl; +Cc: ptxdist
[-- Attachment #1: Type: text/plain, Size: 4841 bytes --]
Hi,
I took a closer look at this and checked what Debian is doing. I've
attached a fixup patch that changes a few things:
- use abi version 5. Some packages lock for that version explicitly.
- use linker scripts too deal with the tinfo problem
- fix some usr-merge fallout.
On Fri, Feb 09, 2018 at 03:14:19PM +0100, Ladislav Michl wrote:
> Signed-off-by: Ladislav Michl <ladis@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/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 := \
NCURSES_AUTOCONF_SHARED is used by host-ncurses, so this is still needed in
some way.
Michael
> - --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
This was for some problems with newer compiler versions. Is this still
needed?
Michael
>
> @@ -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
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
[-- Attachment #2: 0001-fixup-ncurses-version-bump-5.9-6.1.patch --]
[-- Type: text/x-diff, Size: 5104 bytes --]
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
[-- Attachment #3: Type: text/plain, Size: 91 bytes --]
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [ptxdist] [PATCH 1/4] ncurses: version bump 5.9 -> 6.1
2018-02-22 8:12 ` Michael Olbrich
@ 2018-02-22 8:17 ` Michael Olbrich
2018-02-22 9:53 ` Ladislav Michl
1 sibling, 0 replies; 17+ messages in thread
From: Michael Olbrich @ 2018-02-22 8:17 UTC (permalink / raw)
To: ptxdist
Hi,
On Thu, Feb 22, 2018 at 09:12:20AM +0100, Michael Olbrich wrote:
> I took a closer look at this and checked what Debian is doing. I've
> attached a fixup patch that changes a few things:
>
> - use abi version 5. Some packages lock for that version explicitly.
> - use linker scripts too deal with the tinfo problem
This breaks install_lib. You'll need this fix for this:
diff --git a/scripts/lib/ptxd_make_xpkg_pkg.sh b/scripts/lib/ptxd_make_xpkg_pkg.sh
index eb3452e3ad9f..45b3c394b4b3 100644
--- a/scripts/lib/ptxd_make_xpkg_pkg.sh
+++ b/scripts/lib/ptxd_make_xpkg_pkg.sh
@@ -883,7 +883,10 @@ ptxd_install_lib() {
fi
local file="$(for dir in "${pkg_pkg_dir}"${root_dir}{/,/usr/}${lib_dir}; do
- find "${dir}" -type f -path "${dir}/${lib}.so*" ! -name "*.debug"; done 2>/dev/null)"
+ find "${dir}" -type f -path "${dir}/${lib}.so*" ! -name "*.debug"; done 2>/dev/null \
+ | while read f; do
+ grep -q '^INPUT(' "${f}" || echo "${f}"
+ done)"
if [ ! -f "${file}" ]; then
ptxd_install_error "ptxd_lib_install: cannot find library '${lib}'!"
I'll push this to master once I'm done testing.
Michael
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [ptxdist] [PATCH 1/4] ncurses: version bump 5.9 -> 6.1
2018-02-22 8:12 ` Michael Olbrich
2018-02-22 8:17 ` Michael Olbrich
@ 2018-02-22 9:53 ` Ladislav Michl
2018-02-22 10:57 ` Michael Olbrich
1 sibling, 1 reply; 17+ messages in thread
From: Ladislav Michl @ 2018-02-22 9:53 UTC (permalink / raw)
To: ptxdist
Hi Michael,
thanks for your work, I'm currently locked in kernel space, so I cannot
test right now...
On Thu, Feb 22, 2018 at 09:12:20AM +0100, Michael Olbrich wrote:
> Hi,
>
> I took a closer look at this and checked what Debian is doing. I've
> attached a fixup patch that changes a few things:
>
> - use abi version 5. Some packages lock for that version explicitly.
Which are those? As we are certainly carrying fewer packages that Debian
does, isn't it more reasonable to just fix packages?
> - use linker scripts too deal with the tinfo problem
> - fix some usr-merge fallout.
>
> On Fri, Feb 09, 2018 at 03:14:19PM +0100, Ladislav Michl wrote:
> > Signed-off-by: Ladislav Michl <ladis@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/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 := \
>
> NCURSES_AUTOCONF_SHARED is used by host-ncurses, so this is still needed in
> some way.
Ah, I overlooked that. Shall I sent v2 patch or you fixed it already?
Thank you,
ladis
> Michael
>
> > - --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
>
> This was for some problems with newer compiler versions. Is this still
> needed?
>
> Michael
>
> >
> > @@ -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
>
> --
> Pengutronix e.K. | |
> Industrial Linux Solutions | http://www.pengutronix.de/ |
> Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
> Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
> >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
>
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [ptxdist] [PATCH 1/4] ncurses: version bump 5.9 -> 6.1
2018-02-22 9:53 ` Ladislav Michl
@ 2018-02-22 10:57 ` Michael Olbrich
2018-02-27 13:18 ` Ladislav Michl
0 siblings, 1 reply; 17+ messages in thread
From: Michael Olbrich @ 2018-02-22 10:57 UTC (permalink / raw)
To: ptxdist
Hi,
On Thu, Feb 22, 2018 at 10:53:35AM +0100, Ladislav Michl wrote:
> thanks for your work, I'm currently locked in kernel space, so I cannot
> test right now...
That's ok.
> On Thu, Feb 22, 2018 at 09:12:20AM +0100, Michael Olbrich wrote:
> > Hi,
> >
> > I took a closer look at this and checked what Debian is doing. I've
> > attached a fixup patch that changes a few things:
> >
> > - use abi version 5. Some packages lock for that version explicitly.
>
> Which are those? As we are certainly carrying fewer packages that Debian
> does, isn't it more reasonable to just fix packages?
alsa-utils fails, but I think, that is because the pkg-config files are
installed to 'platform-XXX/packages/ncurses-6.1yes'. I think you need to
set that path correctly.
Lets try this again without the abi version but correct pc files. So just
include my other changes but leave the abi-version stuff out for v2.
> > - use linker scripts too deal with the tinfo problem
> > - fix some usr-merge fallout.
> >
> > On Fri, Feb 09, 2018 at 03:14:19PM +0100, Ladislav Michl wrote:
> > > Signed-off-by: Ladislav Michl <ladis@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/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 := \
> >
> > NCURSES_AUTOCONF_SHARED is used by host-ncurses, so this is still needed in
> > some way.
>
> Ah, I overlooked that. Shall I sent v2 patch or you fixed it already?
I haven't fixed this. Please fix this in v2.
Michael
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [ptxdist] [PATCH 1/4] ncurses: version bump 5.9 -> 6.1
2018-02-22 10:57 ` Michael Olbrich
@ 2018-02-27 13:18 ` Ladislav Michl
2018-02-27 15:58 ` Ladislav Michl
2018-02-28 5:58 ` Michael Olbrich
0 siblings, 2 replies; 17+ messages in thread
From: Ladislav Michl @ 2018-02-27 13:18 UTC (permalink / raw)
To: ptxdist
Hi,
On Thu, Feb 22, 2018 at 11:57:51AM +0100, Michael Olbrich wrote:
> > Which are those? As we are certainly carrying fewer packages that Debian
> > does, isn't it more reasonable to just fix packages?
>
> alsa-utils fails, but I think, that is because the pkg-config files are
> installed to 'platform-XXX/packages/ncurses-6.1yes'. I think you need to
> set that path correctly.
Hmm, even with --with-termlib and --with-ticlib new ncurses are not building
those libraries separately. And here comes problem as pkg-config --libs ncurses
claims '-lncurses -ltinfo' which seems to leak from host.
(so I explicitely disabled separate libraries as it does not make much sense
to build them)
alsa-utils configure then runs:
arm-v5te-linux-gnueabi-gcc -o conftest -g -O2 -D_GNU_SOURCE -D_DEFAULT_SOURCE conftest.c -lncurses -ltinfo -lasound -lm -ldl -lpthread
which obviously fails with:
arm-v5te-linux-gnueabi/bin/ld: cannot find -ltinfo
collect2: error: ld returned 1 exit status
> Lets try this again without the abi version but correct pc files. So just
> include my other changes but leave the abi-version stuff out for v2.
Seems pc files are not installed at all. Will investigate further, for
now here's what I'm working with:
Subject: ncurses: version bump 5.9 -> 6.1
Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
diff --git a/patches/ncurses-5.9/0001-teach-ncurses-config-about-sysroot.patch b/patches/ncurses-5.9/0001-teach-ncurses-config-about-sysroot.patch
deleted file mode 100644
index 0730dc9af..000000000
--- a/patches/ncurses-5.9/0001-teach-ncurses-config-about-sysroot.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From: Marc Kleine-Budde <mkl@pengutronix.de>
-Date: Thu, 17 Mar 2011 13:34:53 +0100
-Subject: [PATCH] teach ncurses-config about sysroot
-
-This patch teaches ncurses-config about sysroot
-
-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
- --cflags)
- INCS=
- if test "x@WITH_OVERWRITE@" = xno ; then
-- INCS="$INCS -I${includedir}/${THIS}"
-+ INCS="$INCS -I${SYSROOT}${includedir}/${THIS}"
- fi
-- if test "${includedir}" != /usr/include ; then
-- INCS="$INCS -I${includedir}"
-+ if test "${SYSROOT}${includedir}" != /usr/include ; then
-+ INCS="$INCS -I${SYSROOT}${includedir}"
- 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
- 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
- fi
- ;;
-@@ -114,7 +114,7 @@ ENDECHO
- echo "${includedir}"
- ;;
- --libdir)
-- echo "${libdir}"
-+ echo "${SYSROOT}${libdir}"
- ;;
- --mandir)
- echo "${mandir}"
diff --git a/patches/ncurses-5.9/series b/patches/ncurses-5.9/series
deleted file mode 100644
index fbdd3447d..000000000
--- a/patches/ncurses-5.9/series
+++ /dev/null
@@ -1,4 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-teach-ncurses-config-about-sysroot.patch
-# 2ecf3769442e2e5fb7e575d0a880d32c - git-ptx-patches magic
diff --git a/patches/ncurses-6.1/0001-teach-ncurses-config-about-sysroot.patch b/patches/ncurses-6.1/0001-teach-ncurses-config-about-sysroot.patch
new file mode 100644
index 000000000..64a0e960a
--- /dev/null
+++ b/patches/ncurses-6.1/0001-teach-ncurses-config-about-sysroot.patch
@@ -0,0 +1,49 @@
+From: Marc Kleine-Budde <mkl@pengutronix.de>
+Date: Thu, 17 Mar 2011 13:34:53 +0100
+Subject: [PATCH] teach ncurses-config about sysroot
+
+This patch teaches ncurses-config about sysroot
+
+Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
+---
+ misc/ncurses-config.in | 12 ++++++------
+ 1 files changed, 6 insertions(+), 6 deletions(-)
+
+--- 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="@PKG_CFLAGS@"
+ if test "x@WITH_OVERWRITE@" = xno ; then
+- INCS="$INCS -I${includesubdir}"
++ INCS="$INCS -I${SYSROOT}${includesubdir}"
+ fi
+- if test "${includedir}" != /usr/include ; then
+- INCS="$INCS -I${includedir}"
++ if test "${SYSROOT}${includedir}" != /usr/include ; then
++ INCS="$INCS -I${SYSROOT}${includedir}"
+ fi
+ sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO
+ $INCS
+ ENDECHO
+ ;;
+ --libs)
+- if test "$libdir" = /usr/lib
++ if test "${SYSROOT}$libdir" = /usr/lib
+ then
+ LIBDIR=
+ else
+- LIBDIR=-L$libdir
++ LIBDIR=-L${SYSROOT}$libdir
+ fi
+ 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}"
++ echo "${SYSROOT}${libdir}"
+ ;;
+ --mandir)
+ echo "${mandir}"
diff --git a/patches/ncurses-6.1/series b/patches/ncurses-6.1/series
new file mode 100644
index 000000000..fbdd3447d
--- /dev/null
+++ b/patches/ncurses-6.1/series
@@ -0,0 +1,4 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-teach-ncurses-config-about-sysroot.patch
+# 2ecf3769442e2e5fb7e575d0a880d32c - git-ptx-patches magic
diff --git a/rules/host-ncurses.make b/rules/host-ncurses.make
index c543cb4ca..083ab9b1a 100644
--- a/rules/host-ncurses.make
+++ b/rules/host-ncurses.make
@@ -24,10 +24,7 @@ HOST_NCURSES_CONF_TOOL := autoconf
HOST_NCURSES_CONF_OPT = \
$(HOST_AUTOCONF) \
$(NCURSES_AUTOCONF_SHARED) \
- --without-shared \
- --without-cxx-binding
-
-HOST_NCURSES_CPPFLAGS := -P
+ --without-shared
# ----------------------------------------------------------------------------
# Install
diff --git a/rules/ncurses.make b/rules/ncurses.make
index c2fcde478..c08dca0fd 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,68 @@ 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"
-
-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_AUTCONF_SHARED := \
+ $(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-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
+ --with-shared
# ----------------------------------------------------------------------------
# Install
@@ -123,10 +125,10 @@ ifdef PTXCONF_NCURSES_WIDE_CHAR
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" \
- "$(NCURSES_PKGDIR)/usr/bin/ncurses$(NCURSES_MAJOR)-config"
+ @ln -sf "$(NCURSES_PKGDIR)/usr/bin/ncurses$(NCURSES_MAJOR)-config"\
+ "ncursesw$(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
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [ptxdist] [PATCH 1/4] ncurses: version bump 5.9 -> 6.1
2018-02-27 13:18 ` Ladislav Michl
@ 2018-02-27 15:58 ` Ladislav Michl
2018-02-28 5:58 ` Michael Olbrich
1 sibling, 0 replies; 17+ messages in thread
From: Ladislav Michl @ 2018-02-27 15:58 UTC (permalink / raw)
To: ptxdist
On Tue, Feb 27, 2018 at 02:18:39PM +0100, Ladislav Michl wrote:
> Hi,
>
> On Thu, Feb 22, 2018 at 11:57:51AM +0100, Michael Olbrich wrote:
> > > Which are those? As we are certainly carrying fewer packages that Debian
> > > does, isn't it more reasonable to just fix packages?
> >
> > alsa-utils fails, but I think, that is because the pkg-config files are
> > installed to 'platform-XXX/packages/ncurses-6.1yes'. I think you need to
> > set that path correctly.
>
> Hmm, even with --with-termlib and --with-ticlib new ncurses are not building
> those libraries separately. And here comes problem as pkg-config --libs ncurses
> claims '-lncurses -ltinfo' which seems to leak from host.
> (so I explicitely disabled separate libraries as it does not make much sense
> to build them)
>
> alsa-utils configure then runs:
> arm-v5te-linux-gnueabi-gcc -o conftest -g -O2 -D_GNU_SOURCE -D_DEFAULT_SOURCE conftest.c -lncurses -ltinfo -lasound -lm -ldl -lpthread
> which obviously fails with:
> arm-v5te-linux-gnueabi/bin/ld: cannot find -ltinfo
> collect2: error: ld returned 1 exit status
>
> > Lets try this again without the abi version but correct pc files. So just
> > include my other changes but leave the abi-version stuff out for v2.
>
> Seems pc files are not installed at all. Will investigate further, for
> now here's what I'm working with:
Hmm, ncurses-6.1 is unable to locate pkgconfig libdir itself, but
--with-pkg-config-libdir=$(SYSROOT)/usr/lib/pkgconfig does the trick.
Will sent v2 if test build does not show any other issue.
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [ptxdist] [PATCH 1/4] ncurses: version bump 5.9 -> 6.1
2018-02-27 13:18 ` Ladislav Michl
2018-02-27 15:58 ` Ladislav Michl
@ 2018-02-28 5:58 ` Michael Olbrich
1 sibling, 0 replies; 17+ messages in thread
From: Michael Olbrich @ 2018-02-28 5:58 UTC (permalink / raw)
To: ptxdist
On Tue, Feb 27, 2018 at 02:18:39PM +0100, Ladislav Michl wrote:
> Hi,
>
> On Thu, Feb 22, 2018 at 11:57:51AM +0100, Michael Olbrich wrote:
> > > Which are those? As we are certainly carrying fewer packages that Debian
> > > does, isn't it more reasonable to just fix packages?
> >
> > alsa-utils fails, but I think, that is because the pkg-config files are
> > installed to 'platform-XXX/packages/ncurses-6.1yes'. I think you need to
> > set that path correctly.
>
> Hmm, even with --with-termlib and --with-ticlib new ncurses are not building
> those libraries separately. And here comes problem as pkg-config --libs ncurses
> claims '-lncurses -ltinfo' which seems to leak from host.
> (so I explicitely disabled separate libraries as it does not make much sense
> to build them)
>
> alsa-utils configure then runs:
> arm-v5te-linux-gnueabi-gcc -o conftest -g -O2 -D_GNU_SOURCE -D_DEFAULT_SOURCE conftest.c -lncurses -ltinfo -lasound -lm -ldl -lpthread
> which obviously fails with:
> arm-v5te-linux-gnueabi/bin/ld: cannot find -ltinfo
> collect2: error: ld returned 1 exit status
>
> > Lets try this again without the abi version but correct pc files. So just
> > include my other changes but leave the abi-version stuff out for v2.
>
> Seems pc files are not installed at all. Will investigate further, for
> now here's what I'm working with:
You need to se the path. See below.
>
> Subject: ncurses: version bump 5.9 -> 6.1
>
> Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
>
> diff --git a/patches/ncurses-5.9/0001-teach-ncurses-config-about-sysroot.patch b/patches/ncurses-5.9/0001-teach-ncurses-config-about-sysroot.patch
> deleted file mode 100644
> index 0730dc9af..000000000
> --- a/patches/ncurses-5.9/0001-teach-ncurses-config-about-sysroot.patch
> +++ /dev/null
> @@ -1,52 +0,0 @@
> -From: Marc Kleine-Budde <mkl@pengutronix.de>
> -Date: Thu, 17 Mar 2011 13:34:53 +0100
> -Subject: [PATCH] teach ncurses-config about sysroot
> -
> -This patch teaches ncurses-config about sysroot
> -
> -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
> - --cflags)
> - INCS=
> - if test "x@WITH_OVERWRITE@" = xno ; then
> -- INCS="$INCS -I${includedir}/${THIS}"
> -+ INCS="$INCS -I${SYSROOT}${includedir}/${THIS}"
> - fi
> -- if test "${includedir}" != /usr/include ; then
> -- INCS="$INCS -I${includedir}"
> -+ if test "${SYSROOT}${includedir}" != /usr/include ; then
> -+ INCS="$INCS -I${SYSROOT}${includedir}"
> - 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
> - 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
> - fi
> - ;;
> -@@ -114,7 +114,7 @@ ENDECHO
> - echo "${includedir}"
> - ;;
> - --libdir)
> -- echo "${libdir}"
> -+ echo "${SYSROOT}${libdir}"
> - ;;
> - --mandir)
> - echo "${mandir}"
> diff --git a/patches/ncurses-5.9/series b/patches/ncurses-5.9/series
> deleted file mode 100644
> index fbdd3447d..000000000
> --- a/patches/ncurses-5.9/series
> +++ /dev/null
> @@ -1,4 +0,0 @@
> -# generated by git-ptx-patches
> -#tag:base --start-number 1
> -0001-teach-ncurses-config-about-sysroot.patch
> -# 2ecf3769442e2e5fb7e575d0a880d32c - git-ptx-patches magic
> diff --git a/patches/ncurses-6.1/0001-teach-ncurses-config-about-sysroot.patch b/patches/ncurses-6.1/0001-teach-ncurses-config-about-sysroot.patch
> new file mode 100644
> index 000000000..64a0e960a
> --- /dev/null
> +++ b/patches/ncurses-6.1/0001-teach-ncurses-config-about-sysroot.patch
> @@ -0,0 +1,49 @@
> +From: Marc Kleine-Budde <mkl@pengutronix.de>
> +Date: Thu, 17 Mar 2011 13:34:53 +0100
> +Subject: [PATCH] teach ncurses-config about sysroot
> +
> +This patch teaches ncurses-config about sysroot
> +
> +Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
> +---
> + misc/ncurses-config.in | 12 ++++++------
> + 1 files changed, 6 insertions(+), 6 deletions(-)
> +
> +--- 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="@PKG_CFLAGS@"
> + if test "x@WITH_OVERWRITE@" = xno ; then
> +- INCS="$INCS -I${includesubdir}"
> ++ INCS="$INCS -I${SYSROOT}${includesubdir}"
> + fi
> +- if test "${includedir}" != /usr/include ; then
> +- INCS="$INCS -I${includedir}"
> ++ if test "${SYSROOT}${includedir}" != /usr/include ; then
> ++ INCS="$INCS -I${SYSROOT}${includedir}"
> + fi
> + sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO
> + $INCS
> + ENDECHO
> + ;;
> + --libs)
> +- if test "$libdir" = /usr/lib
> ++ if test "${SYSROOT}$libdir" = /usr/lib
> + then
> + LIBDIR=
> + else
> +- LIBDIR=-L$libdir
> ++ LIBDIR=-L${SYSROOT}$libdir
> + fi
> + 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}"
> ++ echo "${SYSROOT}${libdir}"
> + ;;
> + --mandir)
> + echo "${mandir}"
> diff --git a/patches/ncurses-6.1/series b/patches/ncurses-6.1/series
> new file mode 100644
> index 000000000..fbdd3447d
> --- /dev/null
> +++ b/patches/ncurses-6.1/series
> @@ -0,0 +1,4 @@
> +# generated by git-ptx-patches
> +#tag:base --start-number 1
> +0001-teach-ncurses-config-about-sysroot.patch
> +# 2ecf3769442e2e5fb7e575d0a880d32c - git-ptx-patches magic
> diff --git a/rules/host-ncurses.make b/rules/host-ncurses.make
> index c543cb4ca..083ab9b1a 100644
> --- a/rules/host-ncurses.make
> +++ b/rules/host-ncurses.make
> @@ -24,10 +24,7 @@ HOST_NCURSES_CONF_TOOL := autoconf
> HOST_NCURSES_CONF_OPT = \
> $(HOST_AUTOCONF) \
> $(NCURSES_AUTOCONF_SHARED) \
> - --without-shared \
> - --without-cxx-binding
> -
> -HOST_NCURSES_CPPFLAGS := -P
> + --without-shared
>
> # ----------------------------------------------------------------------------
> # Install
> diff --git a/rules/ncurses.make b/rules/ncurses.make
> index c2fcde478..c08dca0fd 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,68 @@ 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"
> -
> -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_AUTCONF_SHARED := \
NCURSES_AUTOCONF_SHARED := \
(missing 'O')
> + $(CROSS_AUTOCONF_USR) \
This must not be part of NCURSES_AUTOCONF_SHARED
> --without-ada \
> - --without-gpm \
> + --without-cxx \
> + --without-cxx-binding \
> + --enable-db-install \
> --without-manpages \
> + --without-progs \
> + --without-tack \
> --without-tests \
> + --with-curses-h \
--with-pkg-config-libdir=/usr/lib/pkgconfig \
Michael
> + --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
> + --with-shared
>
> # ----------------------------------------------------------------------------
> # Install
> @@ -123,10 +125,10 @@ ifdef PTXCONF_NCURSES_WIDE_CHAR
> 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" \
> - "$(NCURSES_PKGDIR)/usr/bin/ncurses$(NCURSES_MAJOR)-config"
> + @ln -sf "$(NCURSES_PKGDIR)/usr/bin/ncurses$(NCURSES_MAJOR)-config"\
> + "ncursesw$(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
>
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 17+ messages in thread
end of thread, other threads:[~2018-02-28 5:58 UTC | newest]
Thread overview: 17+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-02-09 14:12 [ptxdist] [PATCH 0/4] Bring ncurses to year 2018 Ladislav Michl
2018-02-09 14:14 ` [ptxdist] [PATCH 1/4] ncurses: version bump 5.9 -> 6.1 Ladislav Michl
2018-02-12 13:22 ` Michael Olbrich
2018-02-12 13:42 ` Ladislav Michl
2018-02-12 14:28 ` Michael Olbrich
2018-02-22 8:12 ` Michael Olbrich
2018-02-22 8:17 ` Michael Olbrich
2018-02-22 9:53 ` Ladislav Michl
2018-02-22 10:57 ` Michael Olbrich
2018-02-27 13:18 ` Ladislav Michl
2018-02-27 15:58 ` Ladislav Michl
2018-02-28 5:58 ` Michael Olbrich
2018-02-09 14:14 ` [ptxdist] [PATCH 2/4] dialog: version bump 1.1 -> 1.3 Ladislav Michl
2018-02-14 7:49 ` Michael Olbrich
2018-02-09 14:15 ` [ptxdist] [PATCH 3/4] atop: version bump 1.24 -> 2.3.0 Ladislav Michl
2018-02-14 7:50 ` Michael Olbrich
2018-02-09 14:15 ` [ptxdist] [PATCH 4/4] less: check for tgoto Ladislav Michl
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox