600-fix-compile-flag-mismatch.patch 3.1 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869
  1. diff -ur gdb-6.4/gdb/configure gdb-6.4-patched/gdb/configure
  2. --- gdb-6.4/gdb/configure 2005-07-25 10:08:40.000000000 -0500
  3. +++ gdb-6.4-patched/gdb/configure 2007-02-05 13:22:36.000000000 -0600
  4. @@ -309,7 +309,7 @@
  5. # include <unistd.h>
  6. #endif"
  7. -ac_subdirs_all="$ac_subdirs_all doc testsuite"
  8. +ac_subdirs_all="$ac_subdirs_all doc"
  9. ac_subdirs_all="$ac_subdirs_all gdbtk"
  10. ac_subdirs_all="$ac_subdirs_all multi-ice"
  11. ac_subdirs_all="$ac_subdirs_all gdbserver"
  12. @@ -5940,7 +5940,7 @@
  13. -subdirs="$subdirs doc testsuite"
  14. +subdirs="$subdirs doc"
  15. . $srcdir/configure.host
  16. diff -ur gdb-6.4/gdb/gdbserver/configure gdb-6.4-patched/gdb/gdbserver/configure
  17. --- gdb-6.4/gdb/gdbserver/configure 2005-09-17 18:14:37.000000000 -0500
  18. +++ gdb-6.4-patched/gdb/gdbserver/configure 2007-02-05 13:22:58.000000000 -0600
  19. @@ -1239,7 +1239,7 @@
  20. ac_cache_corrupted=: ;;
  21. ,);;
  22. *)
  23. - if test "x$ac_old_val" != "x$ac_new_val"; then
  24. + if test "`echo $ac_old_val`" != "`echo $ac_new_val`"; then
  25. { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
  26. echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
  27. { echo "$as_me:$LINENO: former value: $ac_old_val" >&5
  28. diff -ur gdb-6.4/gdb/testsuite/configure gdb-6.4-patched/gdb/testsuite/configure
  29. --- gdb-6.4/gdb/testsuite/configure 2005-04-11 09:13:12.000000000 -0500
  30. +++ gdb-6.4-patched/gdb/testsuite/configure 2007-02-05 13:22:36.000000000 -0600
  31. @@ -1248,7 +1248,7 @@
  32. ac_cache_corrupted=: ;;
  33. ,);;
  34. *)
  35. - if test "x$ac_old_val" != "x$ac_new_val"; then
  36. + if test "`echo $ac_old_val" != "`echo $ac_new_val"; then
  37. { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
  38. echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
  39. { echo "$as_me:$LINENO: former value: $ac_old_val" >&5
  40. diff -ur gdb-6.4/Makefile.in gdb-6.4-patched/Makefile.in
  41. --- gdb-6.4/Makefile.in 2005-12-01 23:29:54.000000000 -0600
  42. +++ gdb-6.4-patched/Makefile.in 2007-02-05 13:22:36.000000000 -0600
  43. @@ -383,7 +383,7 @@
  44. # CFLAGS will be just -g. We want to ensure that TARGET libraries
  45. # (which we know are built with gcc) are built with optimizations so
  46. # prepend -O2 when setting CFLAGS_FOR_TARGET.
  47. -CFLAGS_FOR_TARGET = -O2 $(CFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET)
  48. +CFLAGS_FOR_TARGET = $(strip $(CFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET))
  49. SYSROOT_CFLAGS_FOR_TARGET = @SYSROOT_CFLAGS_FOR_TARGET@
  50. # If GCC_FOR_TARGET is not overriden on the command line, then this
  51. diff -ur gdb-6.4/Makefile.tpl gdb-6.4-patched/Makefile.tpl
  52. --- gdb-6.4/Makefile.tpl 2005-10-22 05:37:55.000000000 -0500
  53. +++ gdb-6.4-patched/Makefile.tpl 2007-02-05 13:22:36.000000000 -0600
  54. @@ -386,7 +386,7 @@
  55. # CFLAGS will be just -g. We want to ensure that TARGET libraries
  56. # (which we know are built with gcc) are built with optimizations so
  57. # prepend -O2 when setting CFLAGS_FOR_TARGET.
  58. -CFLAGS_FOR_TARGET = -O2 $(CFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET)
  59. +CFLAGS_FOR_TARGET = $(strip $(CFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET))
  60. SYSROOT_CFLAGS_FOR_TARGET = @SYSROOT_CFLAGS_FOR_TARGET@
  61. # If GCC_FOR_TARGET is not overriden on the command line, then this