diff options
| -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 | ||||
| -rw-r--r-- | source-builder/config/glib-2-1.cfg | 3 | ||||
| -rw-r--r-- | source-builder/config/pixman-0-1.cfg | 3 | ||||
| -rw-r--r-- | source-builder/config/qemu-1-1.cfg | 7 |
8 files changed, 22 insertions, 10 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. diff --git a/source-builder/config/glib-2-1.cfg b/source-builder/config/glib-2-1.cfg index 5aca619..b5c6dd1 100644 --- a/source-builder/config/glib-2-1.cfg +++ b/source-builder/config/glib-2-1.cfg @@ -68,7 +68,8 @@ Source0: http://ftp.gnome.org/pub/gnome/sources/glib/%{glib_version_major}/glib- --infodir=%{_infodir} \ --datadir=%{_datadir} \ --build=%{_build} --host=%{_host} \ - --with-sysroot=$SYSROOT + --with-sysroot=$SYSROOT \ + --disable-dtrace %{__make} %{?_smp_mflags} all diff --git a/source-builder/config/pixman-0-1.cfg b/source-builder/config/pixman-0-1.cfg index cf60723..56ab6bf 100644 --- a/source-builder/config/pixman-0-1.cfg +++ b/source-builder/config/pixman-0-1.cfg @@ -63,7 +63,8 @@ Source0: http://cairographics.org/releases/pixman-%{pixman_version}.tar.gz --mandir=%{_mandir} \ --infodir=%{_infodir} \ --datadir=%{_datadir} \ - --build=%{_build} --host=%{_host} + --build=%{_build} --host=%{_host} \ + --disable-gtk %{__make} %{?_smp_mflags} all diff --git a/source-builder/config/qemu-1-1.cfg b/source-builder/config/qemu-1-1.cfg index 4d81074..1ee7af7 100644 --- a/source-builder/config/qemu-1-1.cfg +++ b/source-builder/config/qemu-1-1.cfg @@ -54,13 +54,16 @@ Source0: http://wiki.qemu-project.org/download/qemu-%{qemu_version}.tar.bz2 SYSROOT=$SB_TMPPREFIX PKG_CONFIG_PATH=$SYSROOT \ - PKG_CONFIG_SYSROOT_DIR=$SB_TMPROOT \ + 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} \ + --enable-trace-backend=simple \ --disable-tools \ --disable-pie \ - --disable-vnc + --disable-vnc \ + --disable-netmap %{__make} %{?_smp_mflags} all |