1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1.2 +++ b/patches/gdb/6.5/600-fix-compile-flag-mismatch.patch Tue May 22 20:42:21 2007 +0000
1.3 @@ -0,0 +1,69 @@
1.4 +diff -ur gdb-6.4/gdb/configure gdb-6.4-patched/gdb/configure
1.5 +--- gdb-6.4/gdb/configure 2005-07-25 10:08:40.000000000 -0500
1.6 ++++ gdb-6.4-patched/gdb/configure 2007-02-05 13:22:36.000000000 -0600
1.7 +@@ -309,7 +309,7 @@
1.8 + # include <unistd.h>
1.9 + #endif"
1.10 +
1.11 +-ac_subdirs_all="$ac_subdirs_all doc testsuite"
1.12 ++ac_subdirs_all="$ac_subdirs_all doc"
1.13 + ac_subdirs_all="$ac_subdirs_all gdbtk"
1.14 + ac_subdirs_all="$ac_subdirs_all multi-ice"
1.15 + ac_subdirs_all="$ac_subdirs_all gdbserver"
1.16 +@@ -5940,7 +5940,7 @@
1.17 +
1.18 +
1.19 +
1.20 +-subdirs="$subdirs doc testsuite"
1.21 ++subdirs="$subdirs doc"
1.22 +
1.23 +
1.24 + . $srcdir/configure.host
1.25 +diff -ur gdb-6.4/gdb/gdbserver/configure gdb-6.4-patched/gdb/gdbserver/configure
1.26 +--- gdb-6.4/gdb/gdbserver/configure 2005-09-17 18:14:37.000000000 -0500
1.27 ++++ gdb-6.4-patched/gdb/gdbserver/configure 2007-02-05 13:22:58.000000000 -0600
1.28 +@@ -1239,7 +1239,7 @@
1.29 + ac_cache_corrupted=: ;;
1.30 + ,);;
1.31 + *)
1.32 +- if test "x$ac_old_val" != "x$ac_new_val"; then
1.33 ++ if test "`echo $ac_old_val`" != "`echo $ac_new_val`"; then
1.34 + { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
1.35 + echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
1.36 + { echo "$as_me:$LINENO: former value: $ac_old_val" >&5
1.37 +diff -ur gdb-6.4/gdb/testsuite/configure gdb-6.4-patched/gdb/testsuite/configure
1.38 +--- gdb-6.4/gdb/testsuite/configure 2005-04-11 09:13:12.000000000 -0500
1.39 ++++ gdb-6.4-patched/gdb/testsuite/configure 2007-02-05 13:22:36.000000000 -0600
1.40 +@@ -1248,7 +1248,7 @@
1.41 + ac_cache_corrupted=: ;;
1.42 + ,);;
1.43 + *)
1.44 +- if test "x$ac_old_val" != "x$ac_new_val"; then
1.45 ++ if test "`echo $ac_old_val" != "`echo $ac_new_val"; then
1.46 + { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
1.47 + echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
1.48 + { echo "$as_me:$LINENO: former value: $ac_old_val" >&5
1.49 +diff -ur gdb-6.4/Makefile.in gdb-6.4-patched/Makefile.in
1.50 +--- gdb-6.4/Makefile.in 2005-12-01 23:29:54.000000000 -0600
1.51 ++++ gdb-6.4-patched/Makefile.in 2007-02-05 13:22:36.000000000 -0600
1.52 +@@ -383,7 +383,7 @@
1.53 + # CFLAGS will be just -g. We want to ensure that TARGET libraries
1.54 + # (which we know are built with gcc) are built with optimizations so
1.55 + # prepend -O2 when setting CFLAGS_FOR_TARGET.
1.56 +-CFLAGS_FOR_TARGET = -O2 $(CFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET)
1.57 ++CFLAGS_FOR_TARGET = $(strip $(CFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET))
1.58 + SYSROOT_CFLAGS_FOR_TARGET = @SYSROOT_CFLAGS_FOR_TARGET@
1.59 +
1.60 + # If GCC_FOR_TARGET is not overriden on the command line, then this
1.61 +diff -ur gdb-6.4/Makefile.tpl gdb-6.4-patched/Makefile.tpl
1.62 +--- gdb-6.4/Makefile.tpl 2005-10-22 05:37:55.000000000 -0500
1.63 ++++ gdb-6.4-patched/Makefile.tpl 2007-02-05 13:22:36.000000000 -0600
1.64 +@@ -386,7 +386,7 @@
1.65 + # CFLAGS will be just -g. We want to ensure that TARGET libraries
1.66 + # (which we know are built with gcc) are built with optimizations so
1.67 + # prepend -O2 when setting CFLAGS_FOR_TARGET.
1.68 +-CFLAGS_FOR_TARGET = -O2 $(CFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET)
1.69 ++CFLAGS_FOR_TARGET = $(strip $(CFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET))
1.70 + SYSROOT_CFLAGS_FOR_TARGET = @SYSROOT_CFLAGS_FOR_TARGET@
1.71 +
1.72 + # If GCC_FOR_TARGET is not overriden on the command line, then this