vapier 15/08/05 06:47:50 Modified: qemu-9999.ebuild ChangeLog Log: Allow disabling of all user & softmmu targets so that the ebuild only installs the various helper tools #556712 by Matthew Thode. (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Revision Changes Path 1.106 app-emulation/qemu/qemu-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.106&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.106&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?r1=1.105&r2=1.106 Index: qemu-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v retrieving revision 1.105 retrieving revision 1.106 diff -u -r1.105 -r1.106 --- qemu-9999.ebuild 5 Aug 2015 06:43:00 -0000 1.105 +++ qemu-9999.ebuild 5 Aug 2015 06:47:50 -0000 1.106 @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.105 2015/08/05 06:43:00 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.106 2015/08/05 06:47:50 vapier Exp $ EAPI=5 @@ -46,10 +46,9 @@ use_user_targets=$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS}) IUSE+=" ${use_softmmu_targets} ${use_user_targets}" -# Require at least one softmmu or user target. +# Allow no targets to be built so that people can get a tools-only build. # Block USE flag configurations known to not work. -REQUIRED_USE="|| ( ${use_softmmu_targets} ${use_user_targets} ) - ${PYTHON_REQUIRED_USE} +REQUIRED_USE="${PYTHON_REQUIRED_USE} gtk2? ( gtk ) qemu_softmmu_targets_arm? ( fdt ) qemu_softmmu_targets_microblaze? ( fdt ) @@ -394,10 +393,18 @@ use gtk && conf_opts+=( --with-gtkabi=$(usex gtk2 2.0 3.0) ) use sdl && conf_opts+=( --with-sdlabi=$(usex sdl2 2.0 1.2) ) ;; + tools) + conf_opts+=( + --disable-linux-user + --disable-system + --disable-blobs + ) + static_flag="static" + ;; esac local targets="${buildtype}_targets" - conf_opts+=( --target-list="${!targets}" ) + [[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" ) # Add support for SystemTAP use systemtap && conf_opts+=( --enable-trace-backend=dtrace ) @@ -448,6 +455,7 @@ [[ -n ${softmmu_targets} ]] && qemu_src_configure "softmmu" [[ -n ${user_targets} ]] && qemu_src_configure "user" + [[ -z ${softmmu_targets}${user_targets} ]] && qemu_src_configure "tools" } src_compile() { @@ -460,6 +468,11 @@ cd "${S}/softmmu-build" default fi + + if [[ -z ${softmmu_targets}${user_targets} ]]; then + cd "${S}/tools-build" + default + fi } src_test() { @@ -505,6 +518,11 @@ fi fi + if [[ -z ${softmmu_targets}${user_targets} ]]; then + cd "${S}/tools-build" + emake DESTDIR="${ED}" install + fi + # Disable mprotect on the qemu binaries as they use JITs to be fast #459348 pushd "${ED}"/usr/bin >/dev/null pax-mark m "${softmmu_bins[@]}" "${user_bins[@]}" 1.348 app-emulation/qemu/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.348&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.348&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?r1=1.347&r2=1.348 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v retrieving revision 1.347 retrieving revision 1.348 diff -u -r1.347 -r1.348 --- ChangeLog 5 Aug 2015 06:43:00 -0000 1.347 +++ ChangeLog 5 Aug 2015 06:47:50 -0000 1.348 @@ -1,6 +1,10 @@ # ChangeLog for app-emulation/qemu # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.347 2015/08/05 06:43:00 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.348 2015/08/05 06:47:50 vapier Exp $ + + 05 Aug 2015; Mike Frysinger <vap...@gentoo.org> qemu-9999.ebuild: + Allow disabling of all user & softmmu targets so that the ebuild only installs + the various helper tools #556712 by Matthew Thode. 05 Aug 2015; Mike Frysinger <vap...@gentoo.org> qemu-2.3.0-r5.ebuild, qemu-9999.ebuild:
