X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=toolchain%2Fgdb%2Fpatches%2F600-fix-compile-flag-mismatch.patch;h=127bee46d8dde19327f015c12de7259cbf6e407b;hb=d9ddc95ce575ba7e892d4f5be500202e9bdbe202;hp=13b72bb96d17c9d566bd18175c3a382ce703d877;hpb=2b754c248784f40f47b22005efdc13fb1600ce79;p=lede-git%2F.git

diff --git a/toolchain/gdb/patches/600-fix-compile-flag-mismatch.patch b/toolchain/gdb/patches/600-fix-compile-flag-mismatch.patch
index 13b72bb96d..127bee46d8 100644
--- a/toolchain/gdb/patches/600-fix-compile-flag-mismatch.patch
+++ b/toolchain/gdb/patches/600-fix-compile-flag-mismatch.patch
@@ -1,31 +1,32 @@
---- a/gdb/gdbserver/configure
-+++ b/gdb/gdbserver/configure
-@@ -1239,7 +1239,7 @@
-       ac_cache_corrupted=: ;;
-     ,);;
-     *)
--      if test "x$ac_old_val" != "x$ac_new_val"; then
-+      if test "`echo x$ac_old_val`" != "`echo x$ac_new_val`"; then
- 	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
- echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
- 	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
 --- a/gdb/configure
 +++ b/gdb/configure
-@@ -272,7 +272,7 @@
- PACKAGE_BUGREPORT=
+@@ -834,8 +834,7 @@ MAKEINFOFLAGS
+ YACC
+ YFLAGS
+ XMKMF'
+-ac_subdirs_all='testsuite
+-gdbtk
++ac_subdirs_all='gdbtk
+ multi-ice
+ gdbserver'
  
- ac_unique_file="main.c"
--ac_subdirs_all="$ac_subdirs_all doc testsuite"
-+ac_subdirs_all="$ac_subdirs_all doc"
- # Factoring default headers for most tests.
- ac_includes_default="\
- #include <stdio.h>
-@@ -3077,7 +3077,7 @@
+@@ -5033,7 +5032,7 @@ $as_echo "$with_auto_load_safe_path" >&6
  
  
  
--subdirs="$subdirs doc testsuite"
-+subdirs="$subdirs doc"
+-subdirs="$subdirs testsuite"
++subdirs="$subdirs"
  
  
- # Provide defaults for some variables set by the per-host and per-target
+ # Check whether to support alternative target configurations
+--- a/gdb/gdbserver/configure
++++ b/gdb/gdbserver/configure
+@@ -2181,7 +2181,7 @@ $as_echo "$as_me: error: \`$ac_var' was
+       ac_cache_corrupted=: ;;
+     ,);;
+     *)
+-      if test "x$ac_old_val" != "x$ac_new_val"; then
++      if test "`echo x$ac_old_val`" != "`echo x$ac_new_val`"; then
+ 	# differences in whitespace do not lead to failure.
+ 	ac_old_val_w=`echo x $ac_old_val`
+ 	ac_new_val_w=`echo x $ac_new_val`