summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2017-02-14 02:02:19 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-02-23 12:49:52 -0800
commit8bcfdf4d29598c6216536cd27c630d540fb4bcbf (patch)
tree165a4c4c604870d71ca794863498121f8d0d9520
parent4a234b5c0e27e110e9ae08777fa26835059fc9cb (diff)
downloadpoky-8bcfdf4d29598c6216536cd27c630d540fb4bcbf.tar.gz
ncurses: 6.0+20160625 -> 6.0+20161126
Add a patch to fix the CC/CFLAGS mangling that broke builds. [RB] (From OE-Core rev: e5d1cbbc1a04b0b190f3706e7ab7421c87d46c78) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/ncurses/files/fix-cflags-mangle.patch18
-rw-r--r--meta/recipes-core/ncurses/ncurses_6.0+20161126.bb (renamed from meta/recipes-core/ncurses/ncurses_6.0+20160625.bb)3
2 files changed, 20 insertions, 1 deletions
diff --git a/meta/recipes-core/ncurses/files/fix-cflags-mangle.patch b/meta/recipes-core/ncurses/files/fix-cflags-mangle.patch
new file mode 100644
index 0000000000..e9447c5b81
--- /dev/null
+++ b/meta/recipes-core/ncurses/files/fix-cflags-mangle.patch
@@ -0,0 +1,18 @@
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+20160625.bb b/meta/recipes-core/ncurses/ncurses_6.0+20161126.bb
index 6514613fe3..e95741f4c3 100644
--- a/meta/recipes-core/ncurses/ncurses_6.0+20160625.bb
+++ b/meta/recipes-core/ncurses/ncurses_6.0+20161126.bb
@@ -1,10 +1,11 @@
1require ncurses.inc 1require ncurses.inc
2 2
3SRC_URI += "file://tic-hang.patch \ 3SRC_URI += "file://tic-hang.patch \
4 file://fix-cflags-mangle.patch \
4 file://config.cache \ 5 file://config.cache \
5" 6"
6# commit id corresponds to the revision in package version 7# commit id corresponds to the revision in package version
7SRCREV = "63dd558cb8e888d6fab5f00bbf7842736a2356b9" 8SRCREV = "3db0bd19cb50e3d9b4f2cf15b7a102fe11302068"
8S = "${WORKDIR}/git" 9S = "${WORKDIR}/git"
9EXTRA_OECONF += "--with-abi-version=5" 10EXTRA_OECONF += "--with-abi-version=5"
10UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+(\+\d+)*)" 11UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+(\+\d+)*)"