summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-core/ncurses/files/0001-tic-hang.patch (renamed from meta/recipes-core/ncurses/files/tic-hang.patch)26
-rw-r--r--meta/recipes-core/ncurses/files/0002-configure-reproducible.patch (renamed from meta/recipes-core/ncurses/files/configure-reproducible.patch)21
-rw-r--r--meta/recipes-core/ncurses/files/fix-cflags-mangle.patch18
-rw-r--r--meta/recipes-core/ncurses/ncurses_6.0+20170715.bb (renamed from meta/recipes-core/ncurses/ncurses_6.0+20161126.bb)7
4 files changed, 42 insertions, 30 deletions
diff --git a/meta/recipes-core/ncurses/files/tic-hang.patch b/meta/recipes-core/ncurses/files/0001-tic-hang.patch
index cba89d26f5..4a970561d7 100644
--- a/meta/recipes-core/ncurses/files/tic-hang.patch
+++ b/meta/recipes-core/ncurses/files/0001-tic-hang.patch
@@ -1,13 +1,26 @@
1From a95590f676209832fe0b27226e6de3cb50e2b97c Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Wed, 16 Aug 2017 14:31:51 +0800
4Subject: [PATCH 1/2] tic hang
5
1Upstream-Status: Inappropriate [configuration] 6Upstream-Status: Inappropriate [configuration]
2 7
3'tic' of some linux distributions (e.g. fedora 11) hang in an infinite 8'tic' of some linux distributions (e.g. fedora 11) hang in an infinite
4loop when processing the original file. 9loop when processing the original file.
5 10
6Index: ncurses-5.7/misc/terminfo.src 11Signed-off-by: anonymous
7=================================================================== 12
8--- ncurses-5.7.orig/misc/terminfo.src 13Rebase to 6.0+20170715
9+++ ncurses-5.7/misc/terminfo.src 14Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
10@@ -3706,12 +3706,11 @@ konsole-xf3x|KDE console window with key 15---
16 misc/terminfo.src | 11 +++++------
17 1 file changed, 5 insertions(+), 6 deletions(-)
18
19diff --git a/misc/terminfo.src b/misc/terminfo.src
20index ee3fab3..176d593 100644
21--- a/misc/terminfo.src
22+++ b/misc/terminfo.src
23@@ -5177,12 +5177,11 @@ konsole-xf3x|KDE console window with keyboard for XFree86 3.x xterm,
11 # The value for kbs reflects local customization rather than the settings used 24 # The value for kbs reflects local customization rather than the settings used
12 # for XFree86 xterm. 25 # for XFree86 xterm.
13 konsole-xf4x|KDE console window with keyboard for XFree86 4.x xterm, 26 konsole-xf4x|KDE console window with keyboard for XFree86 4.x xterm,
@@ -25,3 +38,6 @@ Index: ncurses-5.7/misc/terminfo.src
25 # KDE's "vt100" keyboard has no relationship to any terminal that DEC made, but 38 # KDE's "vt100" keyboard has no relationship to any terminal that DEC made, but
26 # it is still useful for deriving the other entries. 39 # it is still useful for deriving the other entries.
27 konsole-vt100|KDE console window with vt100 (sic) keyboard, 40 konsole-vt100|KDE console window with vt100 (sic) keyboard,
41--
421.8.3.1
43
diff --git a/meta/recipes-core/ncurses/files/configure-reproducible.patch b/meta/recipes-core/ncurses/files/0002-configure-reproducible.patch
index 54a8bdc6b8..c47ce6a8cb 100644
--- a/meta/recipes-core/ncurses/files/configure-reproducible.patch
+++ b/meta/recipes-core/ncurses/files/0002-configure-reproducible.patch
@@ -1,15 +1,27 @@
1From 939c994f3756c2d6d3cab2e6a04d05fa7c2b1d56 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Wed, 16 Aug 2017 14:45:27 +0800
4Subject: [PATCH 2/2] configure: reproducible
5
1"configure" enforces -U for ar flags, breaking deterministic builds. 6"configure" enforces -U for ar flags, breaking deterministic builds.
2The flag was added to fix some vaguely specified "recent POSIX binutil 7The flag was added to fix some vaguely specified "recent POSIX binutil
3build problems" in 2015. 8build problems" in 2015.
4 9
5Upstream-Status: Pending 10Upstream-Status: Pending
6Signed-off-by: Juro Bystricky <juro.bystricky@intel.com> 11Signed-off-by: Juro Bystricky <juro.bystricky@intel.com>
7 12
13Rebase to Rebase to 6.0+20170715
14
15Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
16---
17 configure | 2 +-
18 1 file changed, 1 insertion(+), 1 deletion(-)
19
8diff --git a/configure b/configure 20diff --git a/configure b/configure
9index 7f31208..aa80911 100755 21index 7d7d2c1..f444354 100755
10--- a/configure 22--- a/configure
11+++ b/configure 23+++ b/configure
12@@ -4428,7 +4428,7 @@ if test "${cf_cv_ar_flags+set}" = set; then 24@@ -4458,7 +4458,7 @@ if test "${cf_cv_ar_flags+set}" = set; then
13 else 25 else
14 26
15 cf_cv_ar_flags=unknown 27 cf_cv_ar_flags=unknown
@@ -18,3 +30,6 @@ index 7f31208..aa80911 100755
18 do 30 do
19 31
20 # check if $ARFLAGS already contains this choice 32 # check if $ARFLAGS already contains this choice
33--
341.8.3.1
35
diff --git a/meta/recipes-core/ncurses/files/fix-cflags-mangle.patch b/meta/recipes-core/ncurses/files/fix-cflags-mangle.patch
deleted file mode 100644
index e9447c5b81..0000000000
--- a/meta/recipes-core/ncurses/files/fix-cflags-mangle.patch
+++ /dev/null
@@ -1,18 +0,0 @@
1configure has a piece of logic to detect users "abusing" CC to hold compiler
2flags (which we do). It also has logic to "correct" this by moving the flags
3from CC to CFLAGS, but the sed only handles a single argument in CC.
4
5Replace the sed with awk to filter out all words that start with a hyphen.
6
7Upstream-Status: Pending
8Signed-off-by: Ross Burton <ross.burton@intel.com>
9
10diff --git a/configure b/configure
11index 7f31208..1a29cfc 100755
12--- a/configure
13+++ b/configure
14@@ -2191,2 +2191,2 @@ echo "$as_me: WARNING: your environment misuses the CC variable to hold CFLAGS/C
15- cf_flags=`echo "$CC" | sed -e 's/^.*[ ]\(-[^ ]\)/\1/'`
16- CC=`echo "$CC " | sed -e 's/[ ]-[^ ].*$//' -e 's/[ ]*$//'`
17+ cf_flags=`echo "$CC" | awk 'BEGIN{ORS=" ";RS=" "} /^-.+/ {print $1}'`
18+ CC=`echo "$CC " | awk 'BEGIN{ORS=" ";RS=" "} /^[^-].+/ {print $1}'`
diff --git a/meta/recipes-core/ncurses/ncurses_6.0+20161126.bb b/meta/recipes-core/ncurses/ncurses_6.0+20170715.bb
index ace3108007..127394c006 100644
--- a/meta/recipes-core/ncurses/ncurses_6.0+20161126.bb
+++ b/meta/recipes-core/ncurses/ncurses_6.0+20170715.bb
@@ -1,12 +1,11 @@
1require ncurses.inc 1require ncurses.inc
2 2
3SRC_URI += "file://tic-hang.patch \ 3SRC_URI += "file://0001-tic-hang.patch \
4 file://fix-cflags-mangle.patch \ 4 file://0002-configure-reproducible.patch \
5 file://config.cache \ 5 file://config.cache \
6 file://configure-reproducible.patch \
7" 6"
8# commit id corresponds to the revision in package version 7# commit id corresponds to the revision in package version
9SRCREV = "3db0bd19cb50e3d9b4f2cf15b7a102fe11302068" 8SRCREV = "52681a6a1a18b4d6eb1a716512d0dd827bd71c87"
10S = "${WORKDIR}/git" 9S = "${WORKDIR}/git"
11EXTRA_OECONF += "--with-abi-version=5" 10EXTRA_OECONF += "--with-abi-version=5"
12UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+(\+\d+)*)" 11UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+(\+\d+)*)"