diff options
author | Ross Burton <ross.burton@arm.com> | 2022-09-07 14:02:07 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-09-07 21:28:41 +0100 |
commit | 870f78f63fc55200078c622df2bb4187e954ab1e (patch) | |
tree | 6bf2ae8fb74084f27db75560b99680ff8cb3c389 /meta/recipes-devtools | |
parent | 59ec2d317d23f08b8368e30ce7c0183925bc502f (diff) | |
download | poky-870f78f63fc55200078c622df2bb4187e954ab1e.tar.gz |
gcc: remove obsolete 0012-export-CPP.patch
This patch is no longer needed, the upstream Makefile exports CPP from
CPP_FOR_BUILD since 12.1.
(From OE-Core rev: c7546939574dc5e976caae8f0e705b805962ff03)
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r-- | meta/recipes-devtools/gcc/gcc-12.2.inc | 1 | ||||
-rw-r--r-- | meta/recipes-devtools/gcc/gcc/0012-export-CPP.patch | 50 |
2 files changed, 0 insertions, 51 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-12.2.inc b/meta/recipes-devtools/gcc/gcc-12.2.inc index 572fd8b669..7cc34b2621 100644 --- a/meta/recipes-devtools/gcc/gcc-12.2.inc +++ b/meta/recipes-devtools/gcc/gcc-12.2.inc | |||
@@ -49,7 +49,6 @@ SRC_URI = "${BASEURI} \ | |||
49 | file://0009-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch \ | 49 | file://0009-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch \ |
50 | file://0010-Use-the-multilib-config-files-from-B-instead-of-usin.patch \ | 50 | file://0010-Use-the-multilib-config-files-from-B-instead-of-usin.patch \ |
51 | file://0011-Avoid-using-libdir-from-.la-which-usually-points-to-.patch \ | 51 | file://0011-Avoid-using-libdir-from-.la-which-usually-points-to-.patch \ |
52 | file://0012-export-CPP.patch \ | ||
53 | file://0013-Ensure-target-gcc-headers-can-be-included.patch \ | 52 | file://0013-Ensure-target-gcc-headers-can-be-included.patch \ |
54 | file://0014-Don-t-search-host-directory-during-relink-if-inst_pr.patch \ | 53 | file://0014-Don-t-search-host-directory-during-relink-if-inst_pr.patch \ |
55 | file://0015-libcc1-fix-libcc1-s-install-path-and-rpath.patch \ | 54 | file://0015-libcc1-fix-libcc1-s-install-path-and-rpath.patch \ |
diff --git a/meta/recipes-devtools/gcc/gcc/0012-export-CPP.patch b/meta/recipes-devtools/gcc/gcc/0012-export-CPP.patch deleted file mode 100644 index 7e1ebef463..0000000000 --- a/meta/recipes-devtools/gcc/gcc/0012-export-CPP.patch +++ /dev/null | |||
@@ -1,50 +0,0 @@ | |||
1 | From 20afebc61199cd74481b0b831c1b56465cd37fa0 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 20 Feb 2015 09:40:59 +0000 | ||
4 | Subject: [PATCH] export CPP | ||
5 | |||
6 | The OE environment sets and exports CPP as being the target gcc. When | ||
7 | building gcc-cross-canadian for a mingw targetted sdk, the following can be found | ||
8 | in build.x86_64-pokysdk-mingw32.i586-poky-linux/build-x86_64-linux/libiberty/config.log: | ||
9 | |||
10 | configure:3641: checking for _FILE_OFFSET_BITS value needed for large files | ||
11 | configure:3666: gcc -c -isystem/media/build1/poky/build/tmp/sysroots/x86_64-linux/usr/include -O2 -pipe conftest.c >&5 | ||
12 | configure:3666: $? = 0 | ||
13 | configure:3698: result: no | ||
14 | configure:3786: checking how to run the C preprocessor | ||
15 | configure:3856: result: x86_64-pokysdk-mingw32-gcc -E --sysroot=/media/build1/poky/build/tmp/sysroots/x86_64-nativesdk-mingw32-pokysdk-mingw32 | ||
16 | configure:3876: x86_64-pokysdk-mingw32-gcc -E --sysroot=/media/build1/poky/build/tmp/sysroots/x86_64-nativesdk-mingw32-pokysdk-mingw32 conftest.c | ||
17 | configure:3876: $? = 0 | ||
18 | |||
19 | Note this is a *build* target (in build-x86_64-linux) so it should be | ||
20 | using the host "gcc", not x86_64-pokysdk-mingw32-gcc. Since the mingw32 | ||
21 | headers are very different, using the wrong cpp is a real problem. It is leaking | ||
22 | into configure through the CPP variable. Ultimately this leads to build | ||
23 | failures related to not being able to include a process.h file for pem-unix.c. | ||
24 | |||
25 | The fix is to ensure we export a sane CPP value into the build | ||
26 | environment when using build targets. We could define a CPP_FOR_BUILD value which may be | ||
27 | the version which needs to be upstreamed but for now, this fix is good enough to | ||
28 | avoid the problem. | ||
29 | |||
30 | RP 22/08/2013 | ||
31 | |||
32 | Upstream-Status: Pending | ||
33 | |||
34 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
35 | --- | ||
36 | Makefile.in | 1 + | ||
37 | 1 file changed, 1 insertion(+) | ||
38 | |||
39 | diff --git a/Makefile.in b/Makefile.in | ||
40 | index 1d9c83cc566..11819667751 100644 | ||
41 | --- a/Makefile.in | ||
42 | +++ b/Makefile.in | ||
43 | @@ -152,6 +152,7 @@ BUILD_EXPORTS = \ | ||
44 | AR="$(AR_FOR_BUILD)"; export AR; \ | ||
45 | AS="$(AS_FOR_BUILD)"; export AS; \ | ||
46 | CC="$(CC_FOR_BUILD)"; export CC; \ | ||
47 | + CPP="$(CC_FOR_BUILD) -E"; export CPP; \ | ||
48 | CFLAGS="$(CFLAGS_FOR_BUILD)"; export CFLAGS; \ | ||
49 | CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \ | ||
50 | CPP="$(CPP_FOR_BUILD)"; export CPP; \ | ||