# HG changeset patch
# User cw@f00f.org[kaf24]
# Date 1113993394 0
# Node ID 6b0edacf8b403bf9f54cded892d294a31fd77128
# Parent  b1cb9f7f34f9c4fb1c137760b38e10bdef2d68ea
bitkeeper revision 1.1337 (426630b2jBKjnL7WBIWHGPtgL50rqg)

[PATCH] [PATCH] gdbserver minor build fixes

 gdb-6.2.1-xen-sparse/gdb/gdbserver/configure    |    2 +-
 gdb-6.2.1-xen-sparse/gdb/gdbserver/configure.in |    2 +-
 gdbbuild                                        |   16 ++++++++++++----
 3 files changed, 14 insertions(+), 6 deletions(-)

More cleanups are possible, I'll send those at a later stage.


diff -r b1cb9f7f34f9 -r 6b0edacf8b40 BitKeeper/etc/logging_ok
--- a/BitKeeper/etc/logging_ok	Wed Apr 20 10:25:15 2005 +0000
+++ b/BitKeeper/etc/logging_ok	Wed Apr 20 10:36:34 2005 +0000
@@ -20,6 +20,7 @@ cl349@arcadians.cl.cam.ac.uk
 cl349@firebug.cl.cam.ac.uk
 cl349@freefall.cl.cam.ac.uk
 cl349@labyrinth.cl.cam.ac.uk
+cw@f00f.org
 cwc22@centipede.cl.cam.ac.uk
 cwc22@donkeykong.cl.cam.ac.uk
 djm@djmnc4000.(none)
diff -r b1cb9f7f34f9 -r 6b0edacf8b40 tools/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/configure
--- a/tools/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/configure	Wed Apr 20 10:25:15 2005 +0000
+++ b/tools/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/configure	Wed Apr 20 10:36:34 2005 +0000
@@ -3475,7 +3475,7 @@ USE_THREAD_DB=
 
 
 GDBSERVER_DEPFILES="$srv_regobj $srv_tgtobj $srv_thread_depfiles"
-GDBSERVER_LIBS="$srv_libs -lxc"
+GDBSERVER_LIBS="$srv_libs -L../../../../libxc/ -L../../../../libxutil/ -lxc -lxutil"
 
 
 
diff -r b1cb9f7f34f9 -r 6b0edacf8b40 tools/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/configure.in
--- a/tools/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/configure.in	Wed Apr 20 10:25:15 2005 +0000
+++ b/tools/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/configure.in	Wed Apr 20 10:36:34 2005 +0000
@@ -107,7 +107,7 @@ USE_THREAD_DB=
 
 
 GDBSERVER_DEPFILES="$srv_regobj $srv_tgtobj $srv_thread_depfiles"
-GDBSERVER_LIBS="$srv_libs -lxc"
+GDBSERVER_LIBS="$srv_libs -L../../../../libxc/ -L../../../../libxutil/ -lxc -lxutil"
 
 AC_SUBST(GDBSERVER_DEPFILES)
 AC_SUBST(GDBSERVER_LIBS)
diff -r b1cb9f7f34f9 -r 6b0edacf8b40 tools/gdb/gdbbuild
--- a/tools/gdb/gdbbuild	Wed Apr 20 10:25:15 2005 +0000
+++ b/tools/gdb/gdbbuild	Wed Apr 20 10:36:34 2005 +0000
@@ -1,9 +1,12 @@
-#!/bin/csh -f
-setenv XENROOT `bk root`
+#!/bin/sh
+
+XENROOT=`bk root`
+export XENROOT
 
 cd $XENROOT/tools/gdb
 rm -rf gdb-6.2.1  gdb-6.2.1-linux-i386-xen
-wget ftp://ftp.gnu.org/gnu/gdb/gdb-6.2.1.tar.bz2
+# FIXME:cw this should be smarter
+wget -c ftp://ftp.gnu.org/gnu/gdb/gdb-6.2.1.tar.bz2
 tar xjf gdb-6.2.1.tar.bz2
 
 cd $XENROOT/tools/gdb/gdb-6.2.1-xen-sparse
@@ -12,4 +15,9 @@ cd $XENROOT/tools/gdb/gdb-6.2.1-xen-spar
 mkdir $XENROOT/tools/gdb/gdb-6.2.1-linux-i386-xen
 cd $XENROOT/tools/gdb/gdb-6.2.1-linux-i386-xen
 ../gdb-6.2.1/configure
-gmake -j4
+# some people don't have gmake
+if which gmake ; then
+    gmake -j4
+else
+    make -j4
+fi