summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/ncurses/files/fix-cflags-mangle.patch
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2017-08-16 04:31:22 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-18 10:40:27 +0100
commit624801e0b72d8d5ef1b34b003783234fa6fc89fc (patch)
tree2baa097b131c134dbca0c426041fc0b1c6bc93c1 /meta/recipes-core/ncurses/files/fix-cflags-mangle.patch
parent80cecb6cc9a3765aeb8dd4060a4a994c2625a952 (diff)
downloadpoky-624801e0b72d8d5ef1b34b003783234fa6fc89fc.tar.gz
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 <svenjoac@gmx.de> 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 <hongxu.jia@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/ncurses/files/fix-cflags-mangle.patch')
-rw-r--r--meta/recipes-core/ncurses/files/fix-cflags-mangle.patch18
1 files changed, 0 insertions, 18 deletions
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}'`