6 files changed, 11 insertions, 4 deletions
diff --git a/packages/gdb/gdb.inc b/packages/gdb/gdb.inc
index 8e7121bd49..77a9ca6a3e 100644
--- a/packages/gdb/gdb.inc
+++ b/packages/gdb/gdb.inc
@@ -29,6 +29,11 @@ do_configure () {
 	# override this function to avoid the autoconf/automake/aclocal/autoheader
 	# calls for now
 	(cd ${S} && gnu-configize) || die "failure in running gnu-configize"
+
+	# Remove duplicate spaces to work around configure complaining about
+	# changed LDFLAGS.
+	LDFLAGS=$(echo "${LDFLAGS}" | sed "s/  / /")
+
         CPPFLAGS="" oe_runconf
 }
 
diff --git a/packages/gdb/gdb_6.3.bb b/packages/gdb/gdb_6.3.bb
index 05d4565fc9..5513d348d0 100644
--- a/packages/gdb/gdb_6.3.bb
+++ b/packages/gdb/gdb_6.3.bb
@@ -1,3 +1,3 @@
 require gdb.inc
 
-FILE_PR = "r3"
+FILE_PR = "r4"
diff --git a/packages/gdb/gdb_6.4.bb b/packages/gdb/gdb_6.4.bb
index 06d012903b..134c38426d 100644
--- a/packages/gdb/gdb_6.4.bb
+++ b/packages/gdb/gdb_6.4.bb
@@ -1,3 +1,3 @@
 require gdb.inc
 
-FILE_PR = "r1"
-\ No newline at end of file
+FILE_PR = "r2"
diff --git a/packages/gdb/gdb_6.6.bb b/packages/gdb/gdb_6.6.bb
index 990429056f..db1a89b706 100644
--- a/packages/gdb/gdb_6.6.bb
+++ b/packages/gdb/gdb_6.6.bb
@@ -1,5 +1,5 @@
 require gdb.inc
 
-FILE_PR = "r4"
+FILE_PR = "r5"
 
 SRC_URI += "file://early_debug_in_nptl.patch;patch=1;pnum=0"
diff --git a/packages/gdb/gdb_6.7.1.bb b/packages/gdb/gdb_6.7.1.bb
index a411974b15..167c415dde 100644
--- a/packages/gdb/gdb_6.7.1.bb
+++ b/packages/gdb/gdb_6.7.1.bb
@@ -1,5 +1,7 @@
 require gdb.inc
 
+FILE_PR = "r1"
+
 DEFAULT_PREFERENCE_avr32 = "99"
 SRC_URI_avr32 = " http://avr32linux.org/twiki/pub/Main/GDBPatches/gdb-6.7.1.atmel.1.0.3.tar.bz2"
 S_avr32 = "${WORKDIR}/gdb-6.7.1.atmel.1.0.3"
diff --git a/packages/gdb/gdb_6.8.bb b/packages/gdb/gdb_6.8.bb
index 832c40b97d..134c38426d 100644
--- a/packages/gdb/gdb_6.8.bb
+++ b/packages/gdb/gdb_6.8.bb
@@ -1,3 +1,3 @@
 require gdb.inc
 
-FILE_PR = "r1"
+FILE_PR = "r2"