commit:     9ab61b9162819825424a6f30edb0a2d3290fd56f
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Tue Sep  8 08:17:36 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Tue Sep  8 08:17:48 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ab61b91

app-emulation/qemu: enable sdl-image only for softmmu

qemu's build system became sightly stricter and disallows
'sdl-image' support without 'sdl' support. The check only
makes sense for softmmu build, but is done for all types of
builds.

The change disables 'sdl-image' flag for 'user' and 'tools'
builds.

Reported-by: Rafael Kitover
Closes: https://bugs.gentoo.org/740836
Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 app-emulation/qemu/qemu-9999.ebuild | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/app-emulation/qemu/qemu-9999.ebuild 
b/app-emulation/qemu/qemu-9999.ebuild
index da2bd1246ef..df162166cbf 100644
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@@ -445,6 +445,14 @@ qemu_src_configure() {
                        use_enable "$@"
                fi
        }
+       # Ennable option only for softmmu build, but not 'user' or 'tools'
+       conf_softmmu() {
+               if [[ ${buildtype} == "softmmu" ]] ; then
+                       use_enable "$@"
+               else
+                       echo "--disable-${2:-$1}"
+               fi
+       }
        conf_opts+=(
                $(conf_notuser accessibility brlapi)
                $(conf_notuser aio linux-aio)
@@ -473,7 +481,7 @@ qemu_src_configure() {
                $(conf_notuser rbd)
                $(conf_notuser sasl vnc-sasl)
                $(conf_notuser sdl)
-               $(conf_notuser sdl-image)
+               $(conf_softmmu sdl-image)
                $(conf_notuser seccomp)
                $(conf_notuser slirp slirp system)
                $(conf_notuser smartcard)

Reply via email to