gdb: Make sure expat is not accidentally included

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

3 files changed, 5 insertions, 2 deletions

diff --git a/meta/packages/gdb/gdb-common.inc b/meta/packages/gdb/gdb-common.inc
index fcd911ab0a..d3bda85e1d 100644
--- a/meta/packages/gdb/gdb-common.inc
+++ b/meta/packages/gdb/gdb-common.inc
@@ -21,9 +21,11 @@ B = "${WORKDIR}/build-${TARGET_SYS}"
 
 EXTRA_OEMAKE = "'SUBDIRS=intl mmalloc libiberty opcodes bfd sim gdb etc utils'"
 
+EXPAT = "--without-expat"
+
 EXTRA_OECONF = "--disable-gdbtk --disable-tui --disable-x \
                 --with-curses --disable-multilib --with-readline --disable-sim \
-                ${GDBPROPREFIX} --with-libelf=${STAGING_DIR_TARGET}"
+                ${GDBPROPREFIX} --with-libelf=${STAGING_DIR_TARGET} ${EXPAT}"
 GDBPROPREFIX = "--program-prefix=''"
 
 do_configure () {
diff --git a/meta/packages/gdb/gdb-cross-canadian_7.1.bb b/meta/packages/gdb/gdb-cross-canadian_7.1.bb
index 7a677540e2..5982c0568e 100644
--- a/meta/packages/gdb/gdb-cross-canadian_7.1.bb
+++ b/meta/packages/gdb/gdb-cross-canadian_7.1.bb
@@ -7,3 +7,4 @@ inherit cross-canadian
 PR = "r0"
 
 GDBPROPREFIX = "--program-prefix='${TARGET_PREFIX}'"
+EXPAT = "--with-expat"
diff --git a/meta/packages/gdb/gdb_7.1.bb b/meta/packages/gdb/gdb_7.1.bb
index ec413a1397..5b8f3769bd 100644
--- a/meta/packages/gdb/gdb_7.1.bb
+++ b/meta/packages/gdb/gdb_7.1.bb
@@ -1,3 +1,3 @@
 require gdb.inc
 
-PR = "r0"
+PR = "r1"