Skip to contentSkip to conversation

ncurses: bump to 6.1

PATCH New Adam Duskett 2 participants 4 messages Feb 6, 2018

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ncurses: bump to 6.1

Remove 0002-recognise-uclinux.patch as it has been applies upstream.

---
 package/ncurses/0001-gcc-5.x-MKlib_gen.patch |  5 +++--
 package/ncurses/0002-recognise-uclinux.patch | 29 ----------------------------
 package/ncurses/ncurses.hash                 |  2 +-
 package/ncurses/ncurses.mk                   |  2 +-
 4 files changed, 5 insertions(+), 33 deletions(-)
 delete mode 100644 package/ncurses/0002-recognise-uclinux.patch
package/ncurses/0001-gcc-5.x-MKlib_gen.patch +3 -2
index df7c15fee9..0106e8077f 100644
@@ -11,10 +11,11 @@ http://ncurses.scripts.mit.edu/?p=ncurses.git;a=commit;h=97bb4678dc03e753290b39b
 
 Original author: Thomas E. Dickey <[email protected]>
 Signed-off-by: Mikhail Peselnik <[email protected]>
-
+[Adam Duskett: Refresh for 6.1]
+Signed-off-by: Adam Duskett <[email protected]>
 --- a/ncurses/base/MKlib_gen.sh 2015-08-06 20:48:24.000000000 -0400
 +++ b/ncurses/base/MKlib_gen.sh	2017-02-07 10:09:01.293962392 -0500
-@@ -491,11 +491,22 @@
+@@ -505,11 +505,22 @@
  	-e 's/gen_$//' \
  	-e 's/  / /g' >>$TMP
  
package/ncurses/0002-recognise-uclinux.patch deleted +0 -29
deleted file mode 100644
index 57dd4cf37f..0000000000
@@ -1,29 +0,0 @@
-aclocal: fix detection for uclinux hosts
-uclinux is just a linux like the others...
-
-Signed-off-by: "Yann E. MORIN" <[email protected]>
-Signed-off-by: "Adam Duskett" <[email protected]>
-
---- a/aclocal.m4	2015-08-05 20:46:34.000000000 -0400
-+++ b/aclocal.m4	2017-02-07 09:58:17.770056849 -0500
-@@ -7656,7 +7656,7 @@
- 	cf_xopen_source="-D_SGI_SOURCE"
- 	cf_XOPEN_SOURCE=
- 	;;
--(linux*|gnu*|mint*|k*bsd*-gnu)
-+(linux*|uclinux*|gnu*|mint*|k*bsd*-gnu)
- 	CF_GNU_SOURCE
- 	;;
- (minix*)
-diff -durN a/configure b/configure
---- a/configure	2015-08-05 05:20:32.000000000 -0400
-+++ b/configure	2017-02-07 09:58:52.883886426 -0500
-@@ -7869,7 +7869,7 @@
- 	cf_xopen_source="-D_SGI_SOURCE"
- 	cf_XOPEN_SOURCE=
- 	;;
--(linux*|gnu*|mint*|k*bsd*-gnu)
-+(linux*|uclinux*|gnu*|mint*|k*bsd*-gnu)
- 
- echo "$as_me:7874: checking if we must define _GNU_SOURCE" >&5
- echo $ECHO_N "checking if we must define _GNU_SOURCE... $ECHO_C" >&6
package/ncurses/ncurses.hash +1 -1
index 6bca143836..045625ae3b 100644
@@ -1,2 +1,2 @@
 # Locally calculated after checking pgp signature
-sha256	f551c24b30ce8bfb6e96d9f59b42fbea30fa3a6123384172f9e7284bcf647260	ncurses-6.0.tar.gz
+sha256	aa057eeeb4a14d470101eff4597d5833dcef5965331be3528c08d99cebaa0d17	ncurses-6.1.tar.gz
package/ncurses/ncurses.mk +1 -1
index e63b6e4aed..32ee085314 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-NCURSES_VERSION = 6.0
+NCURSES_VERSION = 6.1
 NCURSES_SITE = $(BR2_GNU_MIRROR)/ncurses
 NCURSES_INSTALL_STAGING = YES
 NCURSES_DEPENDENCIES = host-ncurses
Signature · 1 line
2.14.3
#1 lore raw

PATCH 1/1 ncurses: bump to 6.1

Hello,

Quoted 10 lines · Adam Duskett

Remove 0002-recognise-uclinux.patch as it has been applies upstream.

---
 package/ncurses/0001-gcc-5.x-MKlib_gen.patch |  5 +++--
 package/ncurses/0002-recognise-uclinux.patch | 29 ----------------------------
 package/ncurses/ncurses.hash                 |  2 +-
 package/ncurses/ncurses.mk                   |  2 +-
 4 files changed, 5 insertions(+), 33 deletions(-)
 delete mode 100644 package/ncurses/0002-recognise-uclinux.patch

Applied to next, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com
#2 lore raw

PATCH 1/1 ncurses: bump to 6.1

In reply to Adam Duskett

Hello,

Quoted 10 lines · Adam Duskett

Remove 0002-recognise-uclinux.patch as it has been applies upstream.

---
 package/ncurses/0001-gcc-5.x-MKlib_gen.patch |  5 +++--
 package/ncurses/0002-recognise-uclinux.patch | 29 ----------------------------
 package/ncurses/ncurses.hash                 |  2 +-
 package/ncurses/ncurses.mk                   |  2 +-
 4 files changed, 5 insertions(+), 33 deletions(-)
 delete mode 100644 package/ncurses/0002-recognise-uclinux.patch

This seems to break the build:

http://autobuild.buildroot.net/results/3a5/3a5ddfcf7cd3a5c2bc068e3e33c823d6bcd3e79b/build-end.log

It's because "install -s" is being used, which strips the binary, but it's using plain "strip" and not the cross strip. Ideally, it shouldn't strip the binary at all.

Could you have a look ?

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com
#3 lore raw

PATCH 1/1 ncurses: bump to 6.1

Hello;

Quoted 16 lines · Thomas Petazzoni

Hello,

Quoted 10 lines · Adam Duskett

Remove 0002-recognise-uclinux.patch as it has been applies upstream.

---
 package/ncurses/0001-gcc-5.x-MKlib_gen.patch |  5 +++--
 package/ncurses/0002-recognise-uclinux.patch | 29 ----------------------------
 package/ncurses/ncurses.hash                 |  2 +-
 package/ncurses/ncurses.mk                   |  2 +-
 4 files changed, 5 insertions(+), 33 deletions(-)
 delete mode 100644 package/ncurses/0002-recognise-uclinux.patch

This seems to break the build:

Quoted 8 lines

http://autobuild.buildroot.net/results/3a5/3a5ddfcf7cd3a5c2bc068e3e33c823d6bcd3e79b/build-end.log

It's because "install -s" is being used, which strips the binary, but it's using plain "strip" and not the cross strip. Ideally, it shouldn't strip the binary at all.

Could you have a look ?

I pushed a patch:
https://patchwork.ozlabs.org/patch/869964/

Ncurses introduces the "--disable-stripping" option (which is set to no by default).
enabling the option seems to have fixed the issue!

Quoted 5 lines

Thomas
--
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons) Embedded Linux and Kernel engineering
https://bootlin.com

Adam