diff options
| author | Chris Johns <chrisj@rtems.org> | 2014-02-11 10:38:33 +1100 |
|---|---|---|
| committer | Chris Johns <chrisj@rtems.org> | 2014-02-11 10:38:33 +1100 |
| commit | f27f7c40f64f3ca18582cf3a2a46cad2b7fb2ea9 (patch) | |
| tree | b055ac79bc6afd4f5a461ae6c146674636ee95a5 /bare | |
| parent | sb: Add pkg-config support. (diff) | |
| download | rtems-source-builder-f27f7c40f64f3ca18582cf3a2a46cad2b7fb2ea9.tar.bz2 | |
config: Update qemu to build on FreeBSD.
Update configuration to build on FreeBSD. This is based on pkg-config
detecting the packages installed on the host.
Diffstat (limited to 'bare')
| -rw-r--r-- | bare/config/devel/gettext-0.18.3.1-1.cfg | 4 | ||||
| -rw-r--r-- | bare/config/devel/glib-2.39.3-1.cfg | 4 | ||||
| -rw-r--r-- | bare/config/devel/libffi-3.0.13-1.cfg | 4 | ||||
| -rw-r--r-- | bare/config/devel/pixman-0.32.4-1.cfg | 4 | ||||
| -rw-r--r-- | bare/config/devel/qemu-git-1.cfg | 3 |
5 files changed, 13 insertions, 6 deletions
diff --git a/bare/config/devel/gettext-0.18.3.1-1.cfg b/bare/config/devel/gettext-0.18.3.1-1.cfg index d215e67..5286a62 100644 --- a/bare/config/devel/gettext-0.18.3.1-1.cfg +++ b/bare/config/devel/gettext-0.18.3.1-1.cfg @@ -13,4 +13,6 @@ # # The GetText build instructions. We use 0.x.x Release 1. # -%include %{_configdir}/gettext-0-1.cfg +%ifn %{pkgconfig gettext} + %include %{_configdir}/gettext-0-1.cfg +%endif diff --git a/bare/config/devel/glib-2.39.3-1.cfg b/bare/config/devel/glib-2.39.3-1.cfg index d4bceab..003defe 100644 --- a/bare/config/devel/glib-2.39.3-1.cfg +++ b/bare/config/devel/glib-2.39.3-1.cfg @@ -15,4 +15,6 @@ # # The GLib build instructions. We use 2.x.x Release 1. # -%include %{_configdir}/glib-2-1.cfg +%ifn %{pkgconfig glib-2.0} + %include %{_configdir}/glib-2-1.cfg +%endif diff --git a/bare/config/devel/libffi-3.0.13-1.cfg b/bare/config/devel/libffi-3.0.13-1.cfg index efd5924..f783477 100644 --- a/bare/config/devel/libffi-3.0.13-1.cfg +++ b/bare/config/devel/libffi-3.0.13-1.cfg @@ -13,4 +13,6 @@ # # The LibFFI build instructions. We use 3.x.x Release 1. # -%include %{_configdir}/libffi-3-1.cfg +%ifn %{pkgconfig libffi} + %include %{_configdir}/libffi-3-1.cfg +%endif diff --git a/bare/config/devel/pixman-0.32.4-1.cfg b/bare/config/devel/pixman-0.32.4-1.cfg index 79819be..aadc773 100644 --- a/bare/config/devel/pixman-0.32.4-1.cfg +++ b/bare/config/devel/pixman-0.32.4-1.cfg @@ -13,4 +13,6 @@ # # The Pixman build instructions. We use 0.x.x Release 1. # -%include %{_configdir}/pixman-0-1.cfg +%ifn %{pkgconfig pixman-1} + %include %{_configdir}/pixman-0-1.cfg +%endif diff --git a/bare/config/devel/qemu-git-1.cfg b/bare/config/devel/qemu-git-1.cfg index 259cc70..d242be7 100644 --- a/bare/config/devel/qemu-git-1.cfg +++ b/bare/config/devel/qemu-git-1.cfg @@ -23,8 +23,7 @@ # Qemu is from GIT. # Source0: git://git.qemu-project.org/qemu.git?pull?checkout=%{qemu_version}?submodule=dtc -Patch0: %{rtems_git_tools}/qemu/0001-configure-use-glib-in-glib-pkg-config-check.patch -Patch1: %{rtems_git_tools}/qemu/0001-zynq-Request-qemu-reset-when-PSS_RESET_CTRL-triggere.patch +Patch0: %{rtems_git_tools}/qemu/0001-zynq-Request-qemu-reset-when-PSS_RESET_CTRL-triggere.patch # # The Qemu build instructions. We use 1.x.x Release 1. |