From fb58029ed04c105a80a7ca0ed4a18d5ac924742a Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 15 Jul 2013 16:41:42 -0700 Subject: 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 Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- .../gcc/gcc-4.8/0040-fix-g++-sysroot.patch | 40 ++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 meta/recipes-devtools/gcc/gcc-4.8/0040-fix-g++-sysroot.patch (limited to 'meta/recipes-devtools/gcc/gcc-4.8/0040-fix-g++-sysroot.patch') 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 @@ +Portions of + +http://www.mail-archive.com/gcc-patches@gcc.gnu.org/msg26013.html + +are not upstreamed yet. So lets keep missing pieces. + +Upstream-Status: Pending + +Signed-off-by: Khem Raj + +Index: gcc-4.8.1/gcc/configure.ac +=================================================================== +--- gcc-4.8.1.orig/gcc/configure.ac 2013-07-15 15:55:49.488399132 -0700 ++++ gcc-4.8.1/gcc/configure.ac 2013-07-15 16:02:31.772406679 -0700 +@@ -148,7 +148,9 @@ + if test "${with_sysroot+set}" = set; then + gcc_gxx_without_sysroot=`expr "${gcc_gxx_include_dir}" : "${with_sysroot}"'\(.*\)'` + if test "${gcc_gxx_without_sysroot}"; then +- gcc_gxx_include_dir="${gcc_gxx_without_sysroot}" ++ if test x${with_sysroot} != x/; then ++ gcc_gxx_include_dir="${gcc_gxx_without_sysroot}" ++ fi + gcc_gxx_include_dir_add_sysroot=1 + fi + fi +Index: gcc-4.8.1/gcc/configure +=================================================================== +--- gcc-4.8.1.orig/gcc/configure 2013-07-15 15:55:49.472399132 -0700 ++++ gcc-4.8.1/gcc/configure 2013-07-15 16:02:31.780406680 -0700 +@@ -3325,7 +3325,9 @@ + if test "${with_sysroot+set}" = set; then + gcc_gxx_without_sysroot=`expr "${gcc_gxx_include_dir}" : "${with_sysroot}"'\(.*\)'` + if test "${gcc_gxx_without_sysroot}"; then +- gcc_gxx_include_dir="${gcc_gxx_without_sysroot}" ++ if test x${with_sysroot} != x/; then ++ gcc_gxx_include_dir="${gcc_gxx_without_sysroot}" ++ fi + gcc_gxx_include_dir_add_sysroot=1 + fi + fi -- cgit v1.2.3-54-g00ecf