diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-12-19 11:56:57 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-12-21 10:21:00 +0000 |
commit | dbea61d086973d08be0bca73159bcc3b1bec26a8 (patch) | |
tree | 61add8dd149fd851c994ba2ac340cab37dbcaef2 /meta/recipes-devtools/gcc/gcc-6.4/0011-gcc-poison-dir-extend.patch | |
parent | 04315672fcc9d5b0f8de9afdaa9f39890d645afd (diff) | |
download | poky-dbea61d086973d08be0bca73159bcc3b1bec26a8.tar.gz |
gcc: Drop 6.4
We've had 7.x around for long enough now that it should be tested and usable
everywhere, drop 6.4.
(From OE-Core rev: 2ec354f93101d85b4a3739368c8f0a96ec84c7d0)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/gcc/gcc-6.4/0011-gcc-poison-dir-extend.patch')
-rw-r--r-- | meta/recipes-devtools/gcc/gcc-6.4/0011-gcc-poison-dir-extend.patch | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-6.4/0011-gcc-poison-dir-extend.patch b/meta/recipes-devtools/gcc/gcc-6.4/0011-gcc-poison-dir-extend.patch deleted file mode 100644 index a1736aea12..0000000000 --- a/meta/recipes-devtools/gcc/gcc-6.4/0011-gcc-poison-dir-extend.patch +++ /dev/null | |||
@@ -1,39 +0,0 @@ | |||
1 | From a1c24b59def393e43cd50b6768604a212c788ed3 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 29 Mar 2013 09:00:34 +0400 | ||
4 | Subject: [PATCH 11/46] gcc-poison-dir-extend | ||
5 | |||
6 | Add /sw/include and /opt/include based on the original | ||
7 | zecke-no-host-includes.patch patch. The original patch checked for | ||
8 | /usr/include, /sw/include and /opt/include and then triggered a failure and | ||
9 | aborted. | ||
10 | |||
11 | Instead, we add the two missing items to the current scan. If the user | ||
12 | wants this to be a failure, they can add "-Werror=poison-system-directories". | ||
13 | |||
14 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> | ||
15 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
16 | |||
17 | Upstream-Status: Pending | ||
18 | --- | ||
19 | gcc/incpath.c | 4 +++- | ||
20 | 1 file changed, 3 insertions(+), 1 deletion(-) | ||
21 | |||
22 | diff --git a/gcc/incpath.c b/gcc/incpath.c | ||
23 | index 856da41..d2fc82c 100644 | ||
24 | --- a/gcc/incpath.c | ||
25 | +++ b/gcc/incpath.c | ||
26 | @@ -392,7 +392,9 @@ merge_include_chains (const char *sysroot, cpp_reader *pfile, int verbose) | ||
27 | { | ||
28 | if ((!strncmp (p->name, "/usr/include", 12)) | ||
29 | || (!strncmp (p->name, "/usr/local/include", 18)) | ||
30 | - || (!strncmp (p->name, "/usr/X11R6/include", 18))) | ||
31 | + || (!strncmp (p->name, "/usr/X11R6/include", 18)) | ||
32 | + || (!strncmp (p->name, "/sw/include", 11)) | ||
33 | + || (!strncmp (p->name, "/opt/include", 12))) | ||
34 | warning (OPT_Wpoison_system_directories, | ||
35 | "include location \"%s\" is unsafe for " | ||
36 | "cross-compilation", | ||
37 | -- | ||
38 | 2.8.2 | ||
39 | |||