summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/gcc/gcc-4.6/GPLUSPLUS_INCLUDE_DIR_with_sysroot.patch
diff options
context:
space:
mode:
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.patch32
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 6ccbeea00d..575e0e4b41 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.
58=========================== 58===========================
59Index: gcc-4_6-branch/gcc/Makefile.in 59Index: gcc-4_6-branch/gcc/Makefile.in
60=================================================================== 60===================================================================
61--- gcc-4_6-branch.orig/gcc/Makefile.in 2011-12-13 22:52:15.000000000 -0800 61--- gcc-4_6-branch.orig/gcc/Makefile.in 2012-03-04 09:33:36.000000000 -0800
62+++ gcc-4_6-branch/gcc/Makefile.in 2011-12-13 22:52:21.933635767 -0800 62+++ gcc-4_6-branch/gcc/Makefile.in 2012-03-04 09:41:06.858672113 -0800
63@@ -587,6 +587,7 @@ 63@@ -587,6 +587,7 @@
64 build_tooldir = $(exec_prefix)/$(target_noncanonical) 64 build_tooldir = $(exec_prefix)/$(target_noncanonical)
65 # Directory in which the compiler finds target-independent g++ includes. 65 # Directory in which the compiler finds target-independent g++ includes.
@@ -78,8 +78,8 @@ Index: gcc-4_6-branch/gcc/Makefile.in
78 -DLOCAL_INCLUDE_DIR=\"$(local_includedir)\" \ 78 -DLOCAL_INCLUDE_DIR=\"$(local_includedir)\" \
79Index: gcc-4_6-branch/gcc/configure.ac 79Index: gcc-4_6-branch/gcc/configure.ac
80=================================================================== 80===================================================================
81--- gcc-4_6-branch.orig/gcc/configure.ac 2011-12-13 22:52:15.000000000 -0800 81--- gcc-4_6-branch.orig/gcc/configure.ac 2012-03-04 09:33:36.000000000 -0800
82+++ gcc-4_6-branch/gcc/configure.ac 2011-12-13 22:52:21.937635526 -0800 82+++ gcc-4_6-branch/gcc/configure.ac 2012-03-04 09:41:06.862671939 -0800
83@@ -144,6 +144,15 @@ 83@@ -144,6 +144,15 @@
84 fi 84 fi
85 fi 85 fi
@@ -96,7 +96,7 @@ Index: gcc-4_6-branch/gcc/configure.ac
96 AC_ARG_WITH(cpp_install_dir, 96 AC_ARG_WITH(cpp_install_dir,
97 [ --with-cpp-install-dir=DIR 97 [ --with-cpp-install-dir=DIR
98 install the user visible C preprocessor in DIR 98 install the user visible C preprocessor in DIR
99@@ -4737,6 +4746,7 @@ 99@@ -4727,6 +4736,7 @@
100 AC_SUBST(float_h_file) 100 AC_SUBST(float_h_file)
101 AC_SUBST(gcc_config_arguments) 101 AC_SUBST(gcc_config_arguments)
102 AC_SUBST(gcc_gxx_include_dir) 102 AC_SUBST(gcc_gxx_include_dir)
@@ -106,8 +106,8 @@ Index: gcc-4_6-branch/gcc/configure.ac
106 AC_SUBST(host_xm_include_list) 106 AC_SUBST(host_xm_include_list)
107Index: gcc-4_6-branch/gcc/cppdefault.c 107Index: gcc-4_6-branch/gcc/cppdefault.c
108=================================================================== 108===================================================================
109--- gcc-4_6-branch.orig/gcc/cppdefault.c 2011-12-13 22:51:28.000000000 -0800 109--- gcc-4_6-branch.orig/gcc/cppdefault.c 2012-03-03 01:03:17.000000000 -0800
110+++ gcc-4_6-branch/gcc/cppdefault.c 2011-12-13 22:52:21.937635526 -0800 110+++ gcc-4_6-branch/gcc/cppdefault.c 2012-03-04 09:41:06.862671939 -0800
111@@ -48,15 +48,18 @@ 111@@ -48,15 +48,18 @@
112 = { 112 = {
113 #ifdef GPLUSPLUS_INCLUDE_DIR 113 #ifdef GPLUSPLUS_INCLUDE_DIR
@@ -132,8 +132,8 @@ Index: gcc-4_6-branch/gcc/cppdefault.c
132 /* This is the dir for gcc's private headers. */ 132 /* This is the dir for gcc's private headers. */
133Index: gcc-4_6-branch/gcc/configure 133Index: gcc-4_6-branch/gcc/configure
134=================================================================== 134===================================================================
135--- gcc-4_6-branch.orig/gcc/configure 2011-12-13 22:52:15.000000000 -0800 135--- gcc-4_6-branch.orig/gcc/configure 2012-03-04 09:33:36.000000000 -0800
136+++ gcc-4_6-branch/gcc/configure 2011-12-13 22:52:33.185690436 -0800 136+++ gcc-4_6-branch/gcc/configure 2012-03-04 09:41:12.462671816 -0800
137@@ -636,6 +636,7 @@ 137@@ -636,6 +636,7 @@
138 host_xm_include_list 138 host_xm_include_list
139 host_xm_file_list 139 host_xm_file_list
@@ -158,25 +158,25 @@ Index: gcc-4_6-branch/gcc/configure
158 158
159 # Check whether --with-cpp_install_dir was given. 159 # Check whether --with-cpp_install_dir was given.
160 if test "${with_cpp_install_dir+set}" = set; then : 160 if test "${with_cpp_install_dir+set}" = set; then :
161@@ -17514,7 +17524,7 @@ 161@@ -17504,7 +17514,7 @@
162 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 162 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
163 lt_status=$lt_dlunknown 163 lt_status=$lt_dlunknown
164 cat > conftest.$ac_ext <<_LT_EOF 164 cat > conftest.$ac_ext <<_LT_EOF
165-#line 17517 "configure" 165-#line 17507 "configure"
166+#line 17527 "configure" 166+#line 17517 "configure"
167 #include "confdefs.h" 167 #include "confdefs.h"
168 168
169 #if HAVE_DLFCN_H 169 #if HAVE_DLFCN_H
170@@ -17620,7 +17630,7 @@ 170@@ -17610,7 +17620,7 @@
171 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 171 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
172 lt_status=$lt_dlunknown 172 lt_status=$lt_dlunknown
173 cat > conftest.$ac_ext <<_LT_EOF 173 cat > conftest.$ac_ext <<_LT_EOF
174-#line 17623 "configure" 174-#line 17613 "configure"
175+#line 17633 "configure" 175+#line 17623 "configure"
176 #include "confdefs.h" 176 #include "confdefs.h"
177 177
178 #if HAVE_DLFCN_H 178 #if HAVE_DLFCN_H
179@@ -26151,6 +26161,7 @@ 179@@ -26141,6 +26151,7 @@
180 180
181 181
182 182