1
0
mirror of https://git.yoctoproject.org/poky synced 2026-05-08 17:19:20 +00:00

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>
This commit is contained in:
Hongxu Jia
2017-02-14 02:02:19 -05:00
committed by Richard Purdie
parent 4a234b5c0e
commit 8bcfdf4d29
2 changed files with 20 additions and 1 deletions
@@ -0,0 +1,18 @@
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,10 +1,11 @@
require ncurses.inc
SRC_URI += "file://tic-hang.patch \
file://fix-cflags-mangle.patch \
file://config.cache \
"
# commit id corresponds to the revision in package version
SRCREV = "63dd558cb8e888d6fab5f00bbf7842736a2356b9"
SRCREV = "3db0bd19cb50e3d9b4f2cf15b7a102fe11302068"
S = "${WORKDIR}/git"
EXTRA_OECONF += "--with-abi-version=5"
UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+(\+\d+)*)"