summaryrefslogtreecommitdiffstats
path: root/bare
diff options
context:
space:
mode:
authorChris Johns <chrisj@rtems.org>2014-04-08 15:11:00 +1000
committerChris Johns <chrisj@rtems.org>2014-04-08 15:11:00 +1000
commitf3b549010d814fa5b2404042a687053c575884ac (patch)
tree2dc7497db20e3700fcdd9939844c23c474b51a3b /bare
parentdoc: Updated after GSoC student feedback. (diff)
downloadrtems-source-builder-f3b549010d814fa5b2404042a687053c575884ac.tar.bz2
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.
Diffstat (limited to 'bare')
-rw-r--r--bare/config/devel/libiconv-1.14-1.cfg20
-rw-r--r--bare/config/devel/qemu-git-1.cfg2
-rw-r--r--bare/config/devel/qemu.bset1
3 files changed, 23 insertions, 0 deletions
diff --git a/bare/config/devel/libiconv-1.14-1.cfg b/bare/config/devel/libiconv-1.14-1.cfg
new file mode 100644
index 0000000..d82146f
--- /dev/null
+++ b/bare/config/devel/libiconv-1.14-1.cfg
@@ -0,0 +1,20 @@
+#
+# Libiconv
+#
+
+%if %{release} == %{nil}
+%define release 1
+%endif
+
+%include %{_configdir}/base.cfg
+
+%define libiconv_version 1.14
+
+#
+# The Libiconv build instructions. We use 0.x.x Release 1.
+#
+%if %{_host} == mingw32
+ %ifn %{check iconv >= %{libiconv_version}}
+ %include %{_configdir}/libiconv-1-1.cfg
+ %endif
+%endif
diff --git a/bare/config/devel/qemu-git-1.cfg b/bare/config/devel/qemu-git-1.cfg
index a191e04..da5763c 100644
--- a/bare/config/devel/qemu-git-1.cfg
+++ b/bare/config/devel/qemu-git-1.cfg
@@ -23,6 +23,8 @@ Source0: git://git.qemu-project.org/qemu.git?pull?checkout=%{qemu_version}?submo
#
Patch0: pw://patchwork.ozlabs.org/patch/318435/raw/PULL-29-29-arm-zynq-Add-software-system-reset-via-SCLR.patch
+Patch5: pw://patchwork.ozlabs.org/patch/99999999/raw/qemu-channel-win32-cdecls.patch
+
#
# The Qemu build instructions. We use 1.x.x Release 1.
#
diff --git a/bare/config/devel/qemu.bset b/bare/config/devel/qemu.bset
index 3f50242..e15339d 100644
--- a/bare/config/devel/qemu.bset
+++ b/bare/config/devel/qemu.bset
@@ -11,6 +11,7 @@
%define _internal_autotools_path %{_tmppath}/sb-%{_uid}/${SB_PREFIX_CLEAN}
devel/autotools-internal
+devel/libiconv-1.14-1
devel/gettext-0.18.3.1-1
devel/libffi-3.0.13-1
devel/pixman-0.32.4-1