From f3b549010d814fa5b2404042a687053c575884ac Mon Sep 17 00:00:00 2001
From: Chris Johns <chrisj@rtems.org>
Date: Tue, 8 Apr 2014 15:11:00 +1000
Subject: config,sb: Qemu build updates for FreeBSD and the start of MinG32.

Hack round the FreeBSD iconv support in Freebsd 10. In 10 libc now
supports iconv however iconv.h is present under /usr/local.

Start to add support to build qemu for MinGW via a Cxc. This is a
work in progress and contains lots of hidden traps.

In config.py separate out of the canadian build status.
---
 source-builder/config/qemu-1-1.cfg | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'source-builder/config/qemu-1-1.cfg')

diff --git a/source-builder/config/qemu-1-1.cfg b/source-builder/config/qemu-1-1.cfg
index b671c9e..43c1069 100644
--- a/source-builder/config/qemu-1-1.cfg
+++ b/source-builder/config/qemu-1-1.cfg
@@ -51,14 +51,20 @@ Source0: http://wiki.qemu-project.org/download/qemu-%{qemu_version}.tar.bz2
 
   %{host_build_flags}
 
+  if test "%{_build}" != "%{_host}" ; then
+    CROSS_PREFIX_OPTION="--cross-prefix=%{_host}-"
+  fi
+
   SYSROOT=$SB_TMPPREFIX
 
-  PKG_CONFIG_PATH=$SYSROOT \
+  PKG_CONFIG_PATH=$SYSROOT/lib/pkgconfig \
   PKG_CONFIG_BUILD_TOP_DIR=$SB_TMPROOT \
   %{_ld_library_path}=$SYSROOT/lib \
   LDFLAGS="-Wl,-rpath -Wl,/$SB_PREFIX_CLEAN/lib" \
   ../${source_dir_0}/configure \
     --prefix=%{_prefix} \
+    ${CROSS_PREFIX_OPTION} \
+    --make=%{__make} \
     --disable-werror \
     --disable-tools \
     --disable-pie \
-- 
cgit v1.2.3