summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2015-05-12 13:02:49 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-05-14 11:43:56 +0100
commitf65a6821f4041a905cf6a37f9f409a2938de2350 (patch)
treef8bf52573ebc9ae02ddd67d26fb7d0567f2848c9
parent80f59a37b26b3f12e60fa9df73497155dd3e9460 (diff)
downloadpoky-f65a6821f4041a905cf6a37f9f409a2938de2350.tar.gz
gcc5: Add back g++ sysroot patch
Without this, g++/c++ compilation doesn't work on target due to missing header files. Automated sanity tests fail. Add back the gcc4 patch to address this. (From OE-Core rev: 93d8becf19cc72df650d3aaff7e3ea188bd6e09e) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/gcc/gcc-5.1.inc1
-rw-r--r--meta/recipes-devtools/gcc/gcc-5.1/0038-fix-g++-sysroot.patch44
2 files changed, 45 insertions, 0 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-5.1.inc b/meta/recipes-devtools/gcc/gcc-5.1.inc
index 305736b691..1d64f9e4e4 100644
--- a/meta/recipes-devtools/gcc/gcc-5.1.inc
+++ b/meta/recipes-devtools/gcc/gcc-5.1.inc
@@ -69,6 +69,7 @@ SRC_URI = "\
69 file://0035-Dont-link-the-plugins-with-libgomp-explicitly.patch \ 69 file://0035-Dont-link-the-plugins-with-libgomp-explicitly.patch \
70 file://0036-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch \ 70 file://0036-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch \
71 file://0037-pr65779.patch \ 71 file://0037-pr65779.patch \
72 file://0038-fix-g++-sysroot.patch \
72 " 73 "
73 74
74#S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/gcc-${SNAP}" 75#S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/gcc-${SNAP}"
diff --git a/meta/recipes-devtools/gcc/gcc-5.1/0038-fix-g++-sysroot.patch b/meta/recipes-devtools/gcc/gcc-5.1/0038-fix-g++-sysroot.patch
new file mode 100644
index 0000000000..f024dd5a2e
--- /dev/null
+++ b/meta/recipes-devtools/gcc/gcc-5.1/0038-fix-g++-sysroot.patch
@@ -0,0 +1,44 @@
1Portions of
2
3http://www.mail-archive.com/gcc-patches@gcc.gnu.org/msg26013.html
4
5are not upstreamed yet. So lets keep missing pieces.
6
7Upstream-Status: Pending
8
9Without this, compiling something simple like #include <limits> on target
10with c++ test.cpp fails unable to find the header. strace shows it looking in
11usr/include/xxxx rather than /usr/include/xxxx
12
13Signed-off-by: Khem Raj <raj.khem@gmail.com>
14
15Index: gcc-4.8.1/gcc/configure.ac
16===================================================================
17--- gcc-4.8.1.orig/gcc/configure.ac 2013-07-15 15:55:49.488399132 -0700
18+++ gcc-4.8.1/gcc/configure.ac 2013-07-15 16:02:31.772406679 -0700
19@@ -148,7 +148,9 @@
20 if test "${with_sysroot+set}" = set; then
21 gcc_gxx_without_sysroot=`expr "${gcc_gxx_include_dir}" : "${with_sysroot}"'\(.*\)'`
22 if test "${gcc_gxx_without_sysroot}"; then
23- gcc_gxx_include_dir="${gcc_gxx_without_sysroot}"
24+ if test x${with_sysroot} != x/; then
25+ gcc_gxx_include_dir="${gcc_gxx_without_sysroot}"
26+ fi
27 gcc_gxx_include_dir_add_sysroot=1
28 fi
29 fi
30Index: gcc-4.8.1/gcc/configure
31===================================================================
32--- gcc-4.8.1.orig/gcc/configure 2013-07-15 15:55:49.472399132 -0700
33+++ gcc-4.8.1/gcc/configure 2013-07-15 16:02:31.780406680 -0700
34@@ -3325,7 +3325,9 @@
35 if test "${with_sysroot+set}" = set; then
36 gcc_gxx_without_sysroot=`expr "${gcc_gxx_include_dir}" : "${with_sysroot}"'\(.*\)'`
37 if test "${gcc_gxx_without_sysroot}"; then
38- gcc_gxx_include_dir="${gcc_gxx_without_sysroot}"
39+ if test x${with_sysroot} != x/; then
40+ gcc_gxx_include_dir="${gcc_gxx_without_sysroot}"
41+ fi
42 gcc_gxx_include_dir_add_sysroot=1
43 fi
44 fi