diff options
author | Khem Raj <raj.khem@gmail.com> | 2013-07-15 16:41:42 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-07-18 21:23:44 +0100 |
commit | fb58029ed04c105a80a7ca0ed4a18d5ac924742a (patch) | |
tree | d420409edc3bf0568d083d57e8e0ba924a005cc9 /meta/recipes-devtools/gcc/gcc-4.8 | |
parent | 8f91b1cfc43cd47b5330af06f2e1bac0c4b52c24 (diff) | |
download | poky-fb58029ed04c105a80a7ca0ed4a18d5ac924742a.tar.gz |
gcc-4.8: Fix on-device SDK C++ runtime issue
This fixes the issue where g++ is not able to
find C++ headers when sysroot is '/'
The patch needs to be upstreamed into gcc as well.
[Yocto #4812]
(From OE-Core rev: 18537025ca8777a45cb24f1d9ee781323695607a)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/gcc/gcc-4.8')
-rw-r--r-- | meta/recipes-devtools/gcc/gcc-4.8/0040-fix-g++-sysroot.patch | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-4.8/0040-fix-g++-sysroot.patch b/meta/recipes-devtools/gcc/gcc-4.8/0040-fix-g++-sysroot.patch new file mode 100644 index 0000000000..d50aa5c9bc --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc-4.8/0040-fix-g++-sysroot.patch | |||
@@ -0,0 +1,40 @@ | |||
1 | Portions of | ||
2 | |||
3 | http://www.mail-archive.com/gcc-patches@gcc.gnu.org/msg26013.html | ||
4 | |||
5 | are not upstreamed yet. So lets keep missing pieces. | ||
6 | |||
7 | Upstream-Status: Pending | ||
8 | |||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
10 | |||
11 | Index: gcc-4.8.1/gcc/configure.ac | ||
12 | =================================================================== | ||
13 | --- gcc-4.8.1.orig/gcc/configure.ac 2013-07-15 15:55:49.488399132 -0700 | ||
14 | +++ gcc-4.8.1/gcc/configure.ac 2013-07-15 16:02:31.772406679 -0700 | ||
15 | @@ -148,7 +148,9 @@ | ||
16 | if test "${with_sysroot+set}" = set; then | ||
17 | gcc_gxx_without_sysroot=`expr "${gcc_gxx_include_dir}" : "${with_sysroot}"'\(.*\)'` | ||
18 | if test "${gcc_gxx_without_sysroot}"; then | ||
19 | - gcc_gxx_include_dir="${gcc_gxx_without_sysroot}" | ||
20 | + if test x${with_sysroot} != x/; then | ||
21 | + gcc_gxx_include_dir="${gcc_gxx_without_sysroot}" | ||
22 | + fi | ||
23 | gcc_gxx_include_dir_add_sysroot=1 | ||
24 | fi | ||
25 | fi | ||
26 | Index: gcc-4.8.1/gcc/configure | ||
27 | =================================================================== | ||
28 | --- gcc-4.8.1.orig/gcc/configure 2013-07-15 15:55:49.472399132 -0700 | ||
29 | +++ gcc-4.8.1/gcc/configure 2013-07-15 16:02:31.780406680 -0700 | ||
30 | @@ -3325,7 +3325,9 @@ | ||
31 | if test "${with_sysroot+set}" = set; then | ||
32 | gcc_gxx_without_sysroot=`expr "${gcc_gxx_include_dir}" : "${with_sysroot}"'\(.*\)'` | ||
33 | if test "${gcc_gxx_without_sysroot}"; then | ||
34 | - gcc_gxx_include_dir="${gcc_gxx_without_sysroot}" | ||
35 | + if test x${with_sysroot} != x/; then | ||
36 | + gcc_gxx_include_dir="${gcc_gxx_without_sysroot}" | ||
37 | + fi | ||
38 | gcc_gxx_include_dir_add_sysroot=1 | ||
39 | fi | ||
40 | fi | ||