From e5d1cbbc1a04b0b190f3706e7ab7421c87d46c78 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Tue, 14 Feb 2017 02:02:19 -0500 Subject: ncurses: 6.0+20160625 -> 6.0+20161126 Add a patch to fix the CC/CFLAGS mangling that broke builds. [RB] Signed-off-by: Hongxu Jia Signed-off-by: Ross Burton --- .../recipes-core/ncurses/files/fix-cflags-mangle.patch | 18 ++++++++++++++++++ meta/recipes-core/ncurses/ncurses_6.0+20160625.bb | 10 ---------- meta/recipes-core/ncurses/ncurses_6.0+20161126.bb | 11 +++++++++++ 3 files changed, 29 insertions(+), 10 deletions(-) create mode 100644 meta/recipes-core/ncurses/files/fix-cflags-mangle.patch delete mode 100644 meta/recipes-core/ncurses/ncurses_6.0+20160625.bb create mode 100644 meta/recipes-core/ncurses/ncurses_6.0+20161126.bb (limited to 'meta') 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 @@ +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 + +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}'` diff --git a/meta/recipes-core/ncurses/ncurses_6.0+20160625.bb b/meta/recipes-core/ncurses/ncurses_6.0+20160625.bb deleted file mode 100644 index 6514613fe3..0000000000 --- a/meta/recipes-core/ncurses/ncurses_6.0+20160625.bb +++ /dev/null @@ -1,10 +0,0 @@ -require ncurses.inc - -SRC_URI += "file://tic-hang.patch \ - file://config.cache \ -" -# commit id corresponds to the revision in package version -SRCREV = "63dd558cb8e888d6fab5f00bbf7842736a2356b9" -S = "${WORKDIR}/git" -EXTRA_OECONF += "--with-abi-version=5" -UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+(\.\d+)+(\+\d+)*)" diff --git a/meta/recipes-core/ncurses/ncurses_6.0+20161126.bb b/meta/recipes-core/ncurses/ncurses_6.0+20161126.bb new file mode 100644 index 0000000000..e95741f4c3 --- /dev/null +++ b/meta/recipes-core/ncurses/ncurses_6.0+20161126.bb @@ -0,0 +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 = "3db0bd19cb50e3d9b4f2cf15b7a102fe11302068" +S = "${WORKDIR}/git" +EXTRA_OECONF += "--with-abi-version=5" +UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+(\.\d+)+(\+\d+)*)" -- cgit 1.2.3-korg