commit: d7d649de1938fc5430174b23631ca7784f875fbc Author: Philipp Ammann <philipp.ammann <AT> posteo <DOT> de> AuthorDate: Tue Jul 9 10:15:09 2019 +0000 Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org> CommitDate: Tue Jul 9 11:54:56 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7d649de
app-emulation/qemu: conditionally depend on python Only depend on python when USE="python" is set. Closes: https://github.com/gentoo/gentoo/pull/12408 Package-Manager: Portage-2.3.68, Repoman-2.3.16 Signed-off-by: Philipp Ammann <philipp.ammann <AT> posteo.de> Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org> app-emulation/qemu/qemu-4.0.0-r3.ebuild | 11 ++++++----- app-emulation/qemu/qemu-9999.ebuild | 11 ++++++----- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/app-emulation/qemu/qemu-4.0.0-r3.ebuild b/app-emulation/qemu/qemu-4.0.0-r3.ebuild index bd09a33e9d4..17814190338 100644 --- a/app-emulation/qemu/qemu-4.0.0-r3.ebuild +++ b/app-emulation/qemu/qemu-4.0.0-r3.ebuild @@ -49,7 +49,8 @@ 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_REQUIRED_USE} +REQUIRED_USE=" + python? ( ${PYTHON_REQUIRED_USE} ) qemu_softmmu_targets_arm? ( fdt ) qemu_softmmu_targets_microblaze? ( fdt ) qemu_softmmu_targets_mips64el? ( fdt ) @@ -169,12 +170,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 @@ -190,8 +191,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} @@ -403,10 +404,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) @@ -541,7 +542,7 @@ qemu_src_configure() { src_configure() { local target - python_setup + use python && python_setup softmmu_targets= softmmu_bins=() user_targets= user_bins=() diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild index 3e7962a7640..ba6a088acd8 100644 --- a/app-emulation/qemu/qemu-9999.ebuild +++ b/app-emulation/qemu/qemu-9999.ebuild @@ -49,7 +49,8 @@ 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_REQUIRED_USE} +REQUIRED_USE=" + python? ( ${PYTHON_REQUIRED_USE} ) qemu_softmmu_targets_arm? ( fdt ) qemu_softmmu_targets_microblaze? ( fdt ) qemu_softmmu_targets_mips64el? ( fdt ) @@ -169,13 +170,13 @@ PPC64_FIRMWARE_DEPEND=" " BDEPEND=" - ${PYTHON_DEPS} dev-lang/perl dev-python/sphinx 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 +192,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 +403,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 +541,7 @@ qemu_src_configure() { src_configure() { local target - python_setup + use python && python_setup softmmu_targets= softmmu_bins=() user_targets= user_bins=()
