mirror of
https://git.yoctoproject.org/poky
synced 2026-09-15 06:49:33 +02:00
ncurses: 6.0+20161126 -> 6.0+20170715
Rebase patches: - tic-hang.patch -> 0001 - configure-reproducible.patch -> 0002 Drop fix-cflags-mangle.patch, which accepted by upstream ... commit 1b74f120ab7be89011408a6ad0f1c748a314bae8 Author: Sven Joachim <svenjoac@gmx.de> Date: Sun Feb 26 09:01:34 2017 +0100 Import upstream patch 20170225 20170225 + fixes for CF_CC_ENV_FLAGS (report by Ross Burton). ... (From OE-Core rev: a4ad0703e1209fee6cd89bf74088931785c4d8c7) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
80cecb6cc9
commit
624801e0b7
@@ -1,13 +1,26 @@
|
|||||||
|
From a95590f676209832fe0b27226e6de3cb50e2b97c Mon Sep 17 00:00:00 2001
|
||||||
|
From: Hongxu Jia <hongxu.jia@windriver.com>
|
||||||
|
Date: Wed, 16 Aug 2017 14:31:51 +0800
|
||||||
|
Subject: [PATCH 1/2] tic hang
|
||||||
|
|
||||||
Upstream-Status: Inappropriate [configuration]
|
Upstream-Status: Inappropriate [configuration]
|
||||||
|
|
||||||
'tic' of some linux distributions (e.g. fedora 11) hang in an infinite
|
'tic' of some linux distributions (e.g. fedora 11) hang in an infinite
|
||||||
loop when processing the original file.
|
loop when processing the original file.
|
||||||
|
|
||||||
Index: ncurses-5.7/misc/terminfo.src
|
Signed-off-by: anonymous
|
||||||
===================================================================
|
|
||||||
--- ncurses-5.7.orig/misc/terminfo.src
|
Rebase to 6.0+20170715
|
||||||
+++ ncurses-5.7/misc/terminfo.src
|
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
|
||||||
@@ -3706,12 +3706,11 @@ konsole-xf3x|KDE console window with key
|
---
|
||||||
|
misc/terminfo.src | 11 +++++------
|
||||||
|
1 file changed, 5 insertions(+), 6 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/misc/terminfo.src b/misc/terminfo.src
|
||||||
|
index ee3fab3..176d593 100644
|
||||||
|
--- a/misc/terminfo.src
|
||||||
|
+++ b/misc/terminfo.src
|
||||||
|
@@ -5177,12 +5177,11 @@ konsole-xf3x|KDE console window with keyboard for XFree86 3.x xterm,
|
||||||
# The value for kbs reflects local customization rather than the settings used
|
# The value for kbs reflects local customization rather than the settings used
|
||||||
# for XFree86 xterm.
|
# for XFree86 xterm.
|
||||||
konsole-xf4x|KDE console window with keyboard for XFree86 4.x xterm,
|
konsole-xf4x|KDE console window with keyboard for XFree86 4.x xterm,
|
||||||
@@ -25,3 +38,6 @@ Index: ncurses-5.7/misc/terminfo.src
|
|||||||
# KDE's "vt100" keyboard has no relationship to any terminal that DEC made, but
|
# KDE's "vt100" keyboard has no relationship to any terminal that DEC made, but
|
||||||
# it is still useful for deriving the other entries.
|
# it is still useful for deriving the other entries.
|
||||||
konsole-vt100|KDE console window with vt100 (sic) keyboard,
|
konsole-vt100|KDE console window with vt100 (sic) keyboard,
|
||||||
|
--
|
||||||
|
1.8.3.1
|
||||||
|
|
||||||
@@ -1,15 +1,27 @@
|
|||||||
|
From 939c994f3756c2d6d3cab2e6a04d05fa7c2b1d56 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Hongxu Jia <hongxu.jia@windriver.com>
|
||||||
|
Date: Wed, 16 Aug 2017 14:45:27 +0800
|
||||||
|
Subject: [PATCH 2/2] configure: reproducible
|
||||||
|
|
||||||
"configure" enforces -U for ar flags, breaking deterministic builds.
|
"configure" enforces -U for ar flags, breaking deterministic builds.
|
||||||
The flag was added to fix some vaguely specified "recent POSIX binutil
|
The flag was added to fix some vaguely specified "recent POSIX binutil
|
||||||
build problems" in 2015.
|
build problems" in 2015.
|
||||||
|
|
||||||
Upstream-Status: Pending
|
Upstream-Status: Pending
|
||||||
Signed-off-by: Juro Bystricky <juro.bystricky@intel.com>
|
Signed-off-by: Juro Bystricky <juro.bystricky@intel.com>
|
||||||
|
|
||||||
|
Rebase to Rebase to 6.0+20170715
|
||||||
|
|
||||||
|
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
|
||||||
|
---
|
||||||
|
configure | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
diff --git a/configure b/configure
|
diff --git a/configure b/configure
|
||||||
index 7f31208..aa80911 100755
|
index 7d7d2c1..f444354 100755
|
||||||
--- a/configure
|
--- a/configure
|
||||||
+++ b/configure
|
+++ b/configure
|
||||||
@@ -4428,7 +4428,7 @@ if test "${cf_cv_ar_flags+set}" = set; then
|
@@ -4458,7 +4458,7 @@ if test "${cf_cv_ar_flags+set}" = set; then
|
||||||
else
|
else
|
||||||
|
|
||||||
cf_cv_ar_flags=unknown
|
cf_cv_ar_flags=unknown
|
||||||
@@ -18,3 +30,6 @@ index 7f31208..aa80911 100755
|
|||||||
do
|
do
|
||||||
|
|
||||||
# check if $ARFLAGS already contains this choice
|
# check if $ARFLAGS already contains this choice
|
||||||
|
--
|
||||||
|
1.8.3.1
|
||||||
|
|
||||||
@@ -1,18 +0,0 @@
|
|||||||
configure has a piece of logic to detect users "abusing" CC to hold compiler
|
|
||||||
flags (which we do). It also has logic to "correct" this by moving the flags
|
|
||||||
from CC to CFLAGS, but the sed only handles a single argument in CC.
|
|
||||||
|
|
||||||
Replace the sed with awk to filter out all words that start with a hyphen.
|
|
||||||
|
|
||||||
Upstream-Status: Pending
|
|
||||||
Signed-off-by: Ross Burton <ross.burton@intel.com>
|
|
||||||
|
|
||||||
diff --git a/configure b/configure
|
|
||||||
index 7f31208..1a29cfc 100755
|
|
||||||
--- a/configure
|
|
||||||
+++ b/configure
|
|
||||||
@@ -2191,2 +2191,2 @@ echo "$as_me: WARNING: your environment misuses the CC variable to hold CFLAGS/C
|
|
||||||
- cf_flags=`echo "$CC" | sed -e 's/^.*[ ]\(-[^ ]\)/\1/'`
|
|
||||||
- CC=`echo "$CC " | sed -e 's/[ ]-[^ ].*$//' -e 's/[ ]*$//'`
|
|
||||||
+ cf_flags=`echo "$CC" | awk 'BEGIN{ORS=" ";RS=" "} /^-.+/ {print $1}'`
|
|
||||||
+ CC=`echo "$CC " | awk 'BEGIN{ORS=" ";RS=" "} /^[^-].+/ {print $1}'`
|
|
||||||
@@ -1,12 +1,11 @@
|
|||||||
require ncurses.inc
|
require ncurses.inc
|
||||||
|
|
||||||
SRC_URI += "file://tic-hang.patch \
|
SRC_URI += "file://0001-tic-hang.patch \
|
||||||
file://fix-cflags-mangle.patch \
|
file://0002-configure-reproducible.patch \
|
||||||
file://config.cache \
|
file://config.cache \
|
||||||
file://configure-reproducible.patch \
|
|
||||||
"
|
"
|
||||||
# commit id corresponds to the revision in package version
|
# commit id corresponds to the revision in package version
|
||||||
SRCREV = "3db0bd19cb50e3d9b4f2cf15b7a102fe11302068"
|
SRCREV = "52681a6a1a18b4d6eb1a716512d0dd827bd71c87"
|
||||||
S = "${WORKDIR}/git"
|
S = "${WORKDIR}/git"
|
||||||
EXTRA_OECONF += "--with-abi-version=5"
|
EXTRA_OECONF += "--with-abi-version=5"
|
||||||
UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+(\+\d+)*)"
|
UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+(\+\d+)*)"
|
||||||
Reference in New Issue
Block a user