1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/patches/gdb/6.6/600-fix-compile-flag-mismatch.patch	Thu May 17 16:22:51 2007 +0000
     1.3 @@ -0,0 +1,69 @@
     1.4 +diff -rduNp gdb-6.6-100/Makefile.in gdb-6.6/Makefile.in
     1.5 +--- gdb-6.6-100/Makefile.in	2006-12-18 08:21:19.000000000 +0100
     1.6 ++++ gdb-6.6/Makefile.in	2007-05-14 10:54:29.000000000 +0200
     1.7 +@@ -331,7 +331,7 @@ COMPILER_NM_FOR_TARGET=@COMPILER_NM_FOR_
     1.8 + # CFLAGS will be just -g.  We want to ensure that TARGET libraries
     1.9 + # (which we know are built with gcc) are built with optimizations so
    1.10 + # prepend -O2 when setting CFLAGS_FOR_TARGET.
    1.11 +-CFLAGS_FOR_TARGET = -O2 $(CFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET)
    1.12 ++CFLAGS_FOR_TARGET = $(strip $(CFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET))
    1.13 + SYSROOT_CFLAGS_FOR_TARGET = @SYSROOT_CFLAGS_FOR_TARGET@
    1.14 + CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET)
    1.15 + LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET)
    1.16 +diff -rduNp gdb-6.6-100/Makefile.tpl gdb-6.6/Makefile.tpl
    1.17 +--- gdb-6.6-100/Makefile.tpl	2006-11-15 00:26:39.000000000 +0100
    1.18 ++++ gdb-6.6/Makefile.tpl	2007-05-14 10:54:29.000000000 +0200
    1.19 +@@ -334,7 +334,7 @@ COMPILER_NM_FOR_TARGET=@COMPILER_NM_FOR_
    1.20 + # CFLAGS will be just -g.  We want to ensure that TARGET libraries
    1.21 + # (which we know are built with gcc) are built with optimizations so
    1.22 + # prepend -O2 when setting CFLAGS_FOR_TARGET.
    1.23 +-CFLAGS_FOR_TARGET = -O2 $(CFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET)
    1.24 ++CFLAGS_FOR_TARGET = $(strip $(CFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET))
    1.25 + SYSROOT_CFLAGS_FOR_TARGET = @SYSROOT_CFLAGS_FOR_TARGET@
    1.26 + CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET)
    1.27 + LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET)
    1.28 +diff -rduNp gdb-6.6-100/gdb/configure gdb-6.6/gdb/configure
    1.29 +--- gdb-6.6-100/gdb/configure	2006-12-17 16:38:59.000000000 +0100
    1.30 ++++ gdb-6.6/gdb/configure	2007-05-14 10:55:41.000000000 +0200
    1.31 +@@ -272,7 +272,7 @@ PACKAGE_STRING=
    1.32 + PACKAGE_BUGREPORT=
    1.33 + 
    1.34 + ac_unique_file="main.c"
    1.35 +-ac_subdirs_all="$ac_subdirs_all doc testsuite"
    1.36 ++ac_subdirs_all="$ac_subdirs_all doc"
    1.37 + # Factoring default headers for most tests.
    1.38 + ac_includes_default="\
    1.39 + #include <stdio.h>
    1.40 +@@ -3055,7 +3055,7 @@ _ACEOF
    1.41 + 
    1.42 + 
    1.43 + 
    1.44 +-subdirs="$subdirs doc testsuite"
    1.45 ++subdirs="$subdirs doc"
    1.46 + 
    1.47 + 
    1.48 + # Provide defaults for some variables set by the per-host and per-target
    1.49 +diff -rduNp gdb-6.6-100/gdb/gdbserver/configure gdb-6.6/gdb/gdbserver/configure
    1.50 +--- gdb-6.6-100/gdb/gdbserver/configure	2006-11-22 01:10:19.000000000 +0100
    1.51 ++++ gdb-6.6/gdb/gdbserver/configure	2007-05-14 10:54:29.000000000 +0200
    1.52 +@@ -1239,7 +1239,7 @@ echo "$as_me: error: \`$ac_var' was not 
    1.53 +       ac_cache_corrupted=: ;;
    1.54 +     ,);;
    1.55 +     *)
    1.56 +-      if test "x$ac_old_val" != "x$ac_new_val"; then
    1.57 ++      if test "`echo $ac_old_val`" != "`echo $ac_new_val`"; then
    1.58 + 	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
    1.59 + echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
    1.60 + 	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
    1.61 +diff -rduNp gdb-6.6-100/gdb/testsuite/configure gdb-6.6/gdb/testsuite/configure
    1.62 +--- gdb-6.6-100/gdb/testsuite/configure	2006-06-21 15:57:21.000000000 +0200
    1.63 ++++ gdb-6.6/gdb/testsuite/configure	2007-05-14 10:54:29.000000000 +0200
    1.64 +@@ -1248,7 +1248,7 @@ echo "$as_me: error: \`$ac_var' was not 
    1.65 +       ac_cache_corrupted=: ;;
    1.66 +     ,);;
    1.67 +     *)
    1.68 +-      if test "x$ac_old_val" != "x$ac_new_val"; then
    1.69 ++      if test "`echo $ac_old_val" != "`echo $ac_new_val"; then
    1.70 + 	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
    1.71 + echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
    1.72 + 	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5