summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Maier <tamiko@gentoo.org>2019-07-09 10:12:13 -0500
committerMatthias Maier <tamiko@gentoo.org>2019-07-09 10:14:05 -0500
commit88458fc40e25e9602cddab7554187e038c05da0a (patch)
treee07e50a4d835d3f057fd9a5870bfde9d33d31d58 /app-emulation/qemu/qemu-9999.ebuild
parentnet-libs/davix: drop old (diff)
downloadgentoo-88458fc40e25e9602cddab7554187e038c05da0a.tar.gz
gentoo-88458fc40e25e9602cddab7554187e038c05da0a.tar.bz2
gentoo-88458fc40e25e9602cddab7554187e038c05da0a.zip
Revert "app-emulation/qemu: conditionally depend on python"
This reverts commit d7d649de1938fc5430174b23631ca7784f875fbc. in reference to: https://github.com/gentoo/gentoo/pull/12408 Signed-off-by: Matthias Maier <tamiko@gentoo.org>
Diffstat (limited to 'app-emulation/qemu/qemu-9999.ebuild')
-rw-r--r--app-emulation/qemu/qemu-9999.ebuild11
1 files changed, 5 insertions, 6 deletions
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild
index 85985f8a2ecb..60bf2213431b 100644
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@@ -49,8 +49,7 @@ IUSE+=" ${use_softmmu_targets} ${use_user_targets}"
# 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="
- python? ( ${PYTHON_REQUIRED_USE} )
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
qemu_softmmu_targets_arm? ( fdt )
qemu_softmmu_targets_microblaze? ( fdt )
qemu_softmmu_targets_mips64el? ( fdt )
@@ -170,12 +169,12 @@ PPC64_FIRMWARE_DEPEND="
"
BDEPEND="
+ ${PYTHON_DEPS}
dev-lang/perl
sys-apps/texinfo
virtual/pkgconfig
doc? ( dev-python/sphinx )
gtk? ( nls? ( sys-devel/gettext ) )
- python? ( ${PYTHON_DEPS} )
test? (
dev-libs/glib[utils]
sys-devel/bc
@@ -191,8 +190,8 @@ CDEPEND="
qemu_softmmu_targets_ppc64? ( ${PPC64_FIRMWARE_DEPEND} )
"
DEPEND="${CDEPEND}
+ ${PYTHON_DEPS}
kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
- python? ( ${PYTHON_DEPS} )
static? (
${ALL_DEPEND}
${SOFTMMU_TOOLS_DEPEND}
@@ -402,10 +401,10 @@ qemu_src_configure() {
# are enabled), but it's not really worth the hassle. Disable it
# all the time to avoid automatically detecting it. #568856
--disable-gcrypt
+ --python="${PYTHON}"
--cc="$(tc-getCC)"
--cxx="$(tc-getCXX)"
--host-cc="$(tc-getBUILD_CC)"
- $(use python && echo "--python=${PYTHON}")
$(use_enable debug debug-info)
$(use_enable debug debug-tcg)
$(use_enable doc docs)
@@ -540,7 +539,7 @@ qemu_src_configure() {
src_configure() {
local target
- use python && python_setup
+ python_setup
softmmu_targets= softmmu_bins=()
user_targets= user_bins=()