From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id EAE5B138359 for ; Tue, 8 Sep 2020 08:17:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3E564E0801; Tue, 8 Sep 2020 08:17:55 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 29931E0801 for ; Tue, 8 Sep 2020 08:17:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5440C340E5C for ; Tue, 8 Sep 2020 08:17:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D3896334 for ; Tue, 8 Sep 2020 08:17:52 +0000 (UTC) From: "Sergei Trofimovich" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sergei Trofimovich" Message-ID: <1599553068.9ab61b9162819825424a6f30edb0a2d3290fd56f.slyfox@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/qemu/qemu-9999.ebuild X-VCS-Directories: app-emulation/qemu/ X-VCS-Committer: slyfox X-VCS-Committer-Name: Sergei Trofimovich X-VCS-Revision: 9ab61b9162819825424a6f30edb0a2d3290fd56f X-VCS-Branch: master Date: Tue, 8 Sep 2020 08:17:52 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 256aa122-cd25-4d5e-bce0-83bc0724798f X-Archives-Hash: 1aa3bac39129ee6d3f0d2088fbfac01e commit: 9ab61b9162819825424a6f30edb0a2d3290fd56f Author: Sergei Trofimovich gentoo org> AuthorDate: Tue Sep 8 08:17:36 2020 +0000 Commit: Sergei Trofimovich gentoo 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 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)