From 624801e0b72d8d5ef1b34b003783234fa6fc89fc Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Wed, 16 Aug 2017 04:31:22 -0400 Subject: 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 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 Signed-off-by: Richard Purdie --- .../recipes-core/ncurses/files/fix-cflags-mangle.patch | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 meta/recipes-core/ncurses/files/fix-cflags-mangle.patch (limited to 'meta/recipes-core/ncurses/files/fix-cflags-mangle.patch') 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 @@ -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}'` -- cgit v1.2.3-54-g00ecf