diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-09-04 12:59:01 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-09-05 18:00:00 +0100 |
| commit | 7533c000183a2b447cbabd6ce1b8b75de55b63e7 (patch) | |
| tree | b1147bf7be62665ef5174912ef4ebdfbd5a1c3da | |
| parent | 4feb8614ee25a3d3ceb7f5187120a1256a993155 (diff) | |
| download | openembedded-core-7533c000183a2b447cbabd6ce1b8b75de55b63e7.tar.gz openembedded-core-7533c000183a2b447cbabd6ce1b8b75de55b63e7.tar.bz2 openembedded-core-7533c000183a2b447cbabd6ce1b8b75de55b63e7.zip | |
gcc: Merge two related patches together
These patches may as well be merged together as they affect the same code
and things are clearer this way.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
3 files changed, 4 insertions, 42 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-8.2.inc b/meta/recipes-devtools/gcc/gcc-8.2.inc index 8503a66b07..889187e9c4 100644 --- a/meta/recipes-devtools/gcc/gcc-8.2.inc +++ b/meta/recipes-devtools/gcc/gcc-8.2.inc @@ -33,7 +33,6 @@ SRC_URI = "\ ${BASEURI} \ file://0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch \ file://0003-gcc-poison-system-directories.patch \ - file://0004-gcc-poison-dir-extend.patch \ file://0005-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch \ file://0006-64-bit-multilib-hack.patch \ file://0007-optional-libstdc.patch \ diff --git a/meta/recipes-devtools/gcc/gcc-8.2/0003-gcc-poison-system-directories.patch b/meta/recipes-devtools/gcc/gcc-8.2/0003-gcc-poison-system-directories.patch index 1839d4c7b8..05138976c3 100644 --- a/meta/recipes-devtools/gcc/gcc-8.2/0003-gcc-poison-system-directories.patch +++ b/meta/recipes-devtools/gcc/gcc-8.2/0003-gcc-poison-system-directories.patch @@ -162,7 +162,7 @@ index b11c6a57939..e3b7a21966f 100644 /* Microsoft Windows does not natively support inodes. VMS has non-numeric inodes. */ -@@ -393,6 +394,24 @@ merge_include_chains (const char *sysroot, cpp_reader *pfile, int verbose) +@@ -393,6 +394,26 @@ merge_include_chains (const char *sysroot, cpp_reader *pfile, int verbose) } fprintf (stderr, _("End of search list.\n")); } @@ -176,7 +176,9 @@ index b11c6a57939..e3b7a21966f 100644 + { + if ((!strncmp (p->name, "/usr/include", 12)) + || (!strncmp (p->name, "/usr/local/include", 18)) -+ || (!strncmp (p->name, "/usr/X11R6/include", 18))) ++ || (!strncmp (p->name, "/usr/X11R6/include", 18)) ++ || (!strncmp (p->name, "/sw/include", 11)) ++ || (!strncmp (p->name, "/opt/include", 12))) + warning (OPT_Wpoison_system_directories, + "include location \"%s\" is unsafe for " + "cross-compilation", diff --git a/meta/recipes-devtools/gcc/gcc-8.2/0004-gcc-poison-dir-extend.patch b/meta/recipes-devtools/gcc/gcc-8.2/0004-gcc-poison-dir-extend.patch deleted file mode 100644 index 1072d5b18f..0000000000 --- a/meta/recipes-devtools/gcc/gcc-8.2/0004-gcc-poison-dir-extend.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 97370eadcd10da5da529dfb734df56993ce24644 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 29 Mar 2013 09:00:34 +0400 -Subject: [PATCH 04/39] gcc-poison-dir-extend - -Add /sw/include and /opt/include based on the original -zecke-no-host-includes.patch patch. The original patch checked for -/usr/include, /sw/include and /opt/include and then triggered a failure and -aborted. - -Instead, we add the two missing items to the current scan. If the user -wants this to be a failure, they can add "-Werror=poison-system-directories". - -Signed-off-by: Mark Hatle <mark.hatle@windriver.com> -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -Upstream-Status: Pending ---- - gcc/incpath.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/gcc/incpath.c b/gcc/incpath.c -index e3b7a21966f..9a457e02dd3 100644 ---- a/gcc/incpath.c -+++ b/gcc/incpath.c -@@ -404,7 +404,9 @@ merge_include_chains (const char *sysroot, cpp_reader *pfile, int verbose) - { - if ((!strncmp (p->name, "/usr/include", 12)) - || (!strncmp (p->name, "/usr/local/include", 18)) -- || (!strncmp (p->name, "/usr/X11R6/include", 18))) -+ || (!strncmp (p->name, "/usr/X11R6/include", 18)) -+ || (!strncmp (p->name, "/sw/include", 11)) -+ || (!strncmp (p->name, "/opt/include", 12))) - warning (OPT_Wpoison_system_directories, - "include location \"%s\" is unsafe for " - "cross-compilation", --- -2.17.0 - |