diff options
Diffstat (limited to 'meta/recipes-devtools/gcc/gcc-4.6/GPLUSPLUS_INCLUDE_DIR_with_sysroot.patch')
| -rw-r--r-- | meta/recipes-devtools/gcc/gcc-4.6/GPLUSPLUS_INCLUDE_DIR_with_sysroot.patch | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-4.6/GPLUSPLUS_INCLUDE_DIR_with_sysroot.patch b/meta/recipes-devtools/gcc/gcc-4.6/GPLUSPLUS_INCLUDE_DIR_with_sysroot.patch index 6ccbeea00..575e0e4b4 100644 --- a/meta/recipes-devtools/gcc/gcc-4.6/GPLUSPLUS_INCLUDE_DIR_with_sysroot.patch +++ b/meta/recipes-devtools/gcc/gcc-4.6/GPLUSPLUS_INCLUDE_DIR_with_sysroot.patch @@ -58,8 +58,8 @@ from the sysroot, one of the paths *does* need to be relocated in this way. =========================== Index: gcc-4_6-branch/gcc/Makefile.in =================================================================== ---- gcc-4_6-branch.orig/gcc/Makefile.in 2011-12-13 22:52:15.000000000 -0800 -+++ gcc-4_6-branch/gcc/Makefile.in 2011-12-13 22:52:21.933635767 -0800 +--- gcc-4_6-branch.orig/gcc/Makefile.in 2012-03-04 09:33:36.000000000 -0800 ++++ gcc-4_6-branch/gcc/Makefile.in 2012-03-04 09:41:06.858672113 -0800 @@ -587,6 +587,7 @@ build_tooldir = $(exec_prefix)/$(target_noncanonical) # Directory in which the compiler finds target-independent g++ includes. @@ -78,8 +78,8 @@ Index: gcc-4_6-branch/gcc/Makefile.in -DLOCAL_INCLUDE_DIR=\"$(local_includedir)\" \ Index: gcc-4_6-branch/gcc/configure.ac =================================================================== ---- gcc-4_6-branch.orig/gcc/configure.ac 2011-12-13 22:52:15.000000000 -0800 -+++ gcc-4_6-branch/gcc/configure.ac 2011-12-13 22:52:21.937635526 -0800 +--- gcc-4_6-branch.orig/gcc/configure.ac 2012-03-04 09:33:36.000000000 -0800 ++++ gcc-4_6-branch/gcc/configure.ac 2012-03-04 09:41:06.862671939 -0800 @@ -144,6 +144,15 @@ fi fi @@ -96,7 +96,7 @@ Index: gcc-4_6-branch/gcc/configure.ac AC_ARG_WITH(cpp_install_dir, [ --with-cpp-install-dir=DIR install the user visible C preprocessor in DIR -@@ -4737,6 +4746,7 @@ +@@ -4727,6 +4736,7 @@ AC_SUBST(float_h_file) AC_SUBST(gcc_config_arguments) AC_SUBST(gcc_gxx_include_dir) @@ -106,8 +106,8 @@ Index: gcc-4_6-branch/gcc/configure.ac AC_SUBST(host_xm_include_list) Index: gcc-4_6-branch/gcc/cppdefault.c =================================================================== ---- gcc-4_6-branch.orig/gcc/cppdefault.c 2011-12-13 22:51:28.000000000 -0800 -+++ gcc-4_6-branch/gcc/cppdefault.c 2011-12-13 22:52:21.937635526 -0800 +--- gcc-4_6-branch.orig/gcc/cppdefault.c 2012-03-03 01:03:17.000000000 -0800 ++++ gcc-4_6-branch/gcc/cppdefault.c 2012-03-04 09:41:06.862671939 -0800 @@ -48,15 +48,18 @@ = { #ifdef GPLUSPLUS_INCLUDE_DIR @@ -132,8 +132,8 @@ Index: gcc-4_6-branch/gcc/cppdefault.c /* This is the dir for gcc's private headers. */ Index: gcc-4_6-branch/gcc/configure =================================================================== ---- gcc-4_6-branch.orig/gcc/configure 2011-12-13 22:52:15.000000000 -0800 -+++ gcc-4_6-branch/gcc/configure 2011-12-13 22:52:33.185690436 -0800 +--- gcc-4_6-branch.orig/gcc/configure 2012-03-04 09:33:36.000000000 -0800 ++++ gcc-4_6-branch/gcc/configure 2012-03-04 09:41:12.462671816 -0800 @@ -636,6 +636,7 @@ host_xm_include_list host_xm_file_list @@ -158,25 +158,25 @@ Index: gcc-4_6-branch/gcc/configure # Check whether --with-cpp_install_dir was given. if test "${with_cpp_install_dir+set}" = set; then : -@@ -17514,7 +17524,7 @@ +@@ -17504,7 +17514,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 17517 "configure" -+#line 17527 "configure" +-#line 17507 "configure" ++#line 17517 "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -17620,7 +17630,7 @@ +@@ -17610,7 +17620,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 17623 "configure" -+#line 17633 "configure" +-#line 17613 "configure" ++#line 17623 "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -26151,6 +26161,7 @@ +@@ -26141,6 +26151,7 @@ |