From 71d2f41cf97c07734cff6210a2406ff12fb97f48 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN\"" <yann.morin.1998@free.fr>
Date: Sun, 3 Mar 2013 16:19:32 +0100
Subject: debug/gdb: always enable expat for the cross-gdb

There's no point in not supporting XML in the cross-gdb.
I mean, come on... ;-)

It's still the responsibility of the user to have the necessary
devel expat packages installed for his/her distro.

Reported-by: Trevor Woerner <twoerner@gmail.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

diff --git a/scripts/build/debug/300-gdb.sh b/scripts/build/debug/300-gdb.sh
index 4b12cc5..55050df 100644
--- a/scripts/build/debug/300-gdb.sh
+++ b/scripts/build/debug/300-gdb.sh
@@ -145,12 +145,8 @@ do_debug_gdb_build() {
             LD_for_gdb="ld -static"
         fi
 
-        if [ "${need_expat_src}" = "y" ]; then
-            cross_extra_config+=("--with-expat=yes")
-        else
-            cross_extra_config+=("--disable-expat")
-            cross_extra_config+=("--with-expat=no")
-        fi
+        cross_extra_config+=("--enable-expat")
+        cross_extra_config+=("--with-expat=yes")
 
         [ "${CT_TOOLCHAIN_ENABLE_NLS}" != "y" ] &&    \
         cross_extra_config+=("--disable-nls")
@@ -283,10 +279,10 @@ do_debug_gdb_build() {
         # Build libexpat
         CT_DoLog EXTRA "Building static target expat"
         CT_mkdir_pushd "${CT_BUILD_DIR}/build-expat-target-${CT_TARGET}"
-        do_expat_backend host="${CT_TARGET}"                    \
-                         prefix="${CT_BUILD_DIR}/static-target" \
-                         cflags=""                              \
-                         ldflags=""
+        do_gdb_expat_backend host="${CT_TARGET}"                    \
+                             prefix="${CT_BUILD_DIR}/static-target" \
+                             cflags=""                              \
+                             ldflags=""
         CT_Popd
         native_extra_config+=("--with-expat")
         native_extra_config+=("--with-libexpat-prefix=${CT_BUILD_DIR}/static-target")
-- 
cgit v0.10.2-6-g49f6