vapier 15/08/05 06:27:14 Modified: qemu-9999.ebuild ChangeLog Log: Unify target logic a bit. (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Revision Changes Path 1.104 app-emulation/qemu/qemu-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.104&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.104&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?r1=1.103&r2=1.104 Index: qemu-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v retrieving revision 1.103 retrieving revision 1.104 diff -u -r1.103 -r1.104 --- qemu-9999.ebuild 25 Jul 2015 19:30:13 -0000 1.103 +++ qemu-9999.ebuild 5 Aug 2015 06:27:13 -0000 1.104 @@ -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.103 2015/07/25 19:30:13 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.104 2015/08/05 06:27:13 vapier Exp $ EAPI=5 @@ -294,9 +294,11 @@ debug-print-function ${FUNCNAME} "$@" local buildtype=$1 - local builddir=$2 + local builddir="${S}/${buildtype}-build" local static_flag="static-${buildtype}" + mkdir "${builddir}" + # audio options local audio_opts="oss" use alsa && audio_opts="alsa,${audio_opts}" @@ -378,7 +380,6 @@ conf_opts+=( --enable-linux-user --disable-system - --target-list="${user_targets}" --disable-blobs --disable-tools ) @@ -387,7 +388,6 @@ conf_opts+=( --disable-linux-user --enable-system - --target-list="${softmmu_targets}" --with-system-pixman --audio-drv-list="${audio_opts}" ) @@ -396,6 +396,9 @@ ;; esac + local targets="${buildtype}_targets" + conf_opts+=( --target-list="${!targets}" ) + # Add support for SystemTAP use systemtap && conf_opts+=( --enable-trace-backend=dtrace ) @@ -408,7 +411,7 @@ gcc-specs-pie && conf_opts+=( --enable-pie ) fi - einfo "../configure ${conf_opts[*]}" + echo "../configure ${conf_opts[*]}" cd "${builddir}" ../configure "${conf_opts[@]}" || die "configure failed" @@ -440,21 +443,11 @@ fi done - [[ -n ${softmmu_targets} ]] && \ - einfo "Building the following softmmu targets: ${softmmu_targets}" - - [[ -n ${user_targets} ]] && \ - einfo "Building the following user targets: ${user_targets}" - - if [[ -n ${softmmu_targets} ]]; then - mkdir "${S}/softmmu-build" - qemu_src_configure "softmmu" "${S}/softmmu-build" - fi + softmmu_targets=${softmmu_targets#,} + user_targets=${user_targets#,} - if [[ -n ${user_targets} ]]; then - mkdir "${S}/user-build" - qemu_src_configure "user" "${S}/user-build" - fi + [[ -n ${softmmu_targets} ]] && qemu_src_configure "softmmu" + [[ -n ${user_targets} ]] && qemu_src_configure "user" } src_compile() { 1.346 app-emulation/qemu/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.346&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.346&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?r1=1.345&r2=1.346 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v retrieving revision 1.345 retrieving revision 1.346 diff -u -r1.345 -r1.346 --- ChangeLog 4 Aug 2015 08:19:33 -0000 1.345 +++ ChangeLog 5 Aug 2015 06:27:13 -0000 1.346 @@ -1,6 +1,9 @@ # 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.345 2015/08/04 08:19:33 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.346 2015/08/05 06:27:13 vapier Exp $ + + 05 Aug 2015; Mike Frysinger <[email protected]> qemu-9999.ebuild: + Unify target logic a bit. 04 Aug 2015; Agostino Sarubbo <[email protected]> qemu-2.3.0-r5.ebuild: Stable for x86, wrt bug #556630
