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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 38084158086 for ; Sat, 1 Jan 2022 09:42:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1DD992BC10A; Sat, 1 Jan 2022 09:42:51 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7145F2BC108 for ; Sat, 1 Jan 2022 09:42:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4008A34314C for ; Sat, 1 Jan 2022 09:42:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D40C0272 for ; Sat, 1 Jan 2022 09:42:47 +0000 (UTC) From: "John Helmert III" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "John Helmert III" Message-ID: <1641030109.320efbeeab0c2dd27f151313782f35aa3e4e2b54.ajak@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: ajak X-VCS-Committer-Name: John Helmert III X-VCS-Revision: 320efbeeab0c2dd27f151313782f35aa3e4e2b54 X-VCS-Branch: master Date: Sat, 1 Jan 2022 09:42:47 +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: 53a51bb5-2dc7-484e-ab5c-3d147cb06a68 X-Archives-Hash: 1f41e0a235377988380eecaf281bf4ca commit: 320efbeeab0c2dd27f151313782f35aa3e4e2b54 Author: John Helmert III gentoo org> AuthorDate: Sat Jan 1 09:40:39 2022 +0000 Commit: John Helmert III gentoo org> CommitDate: Sat Jan 1 09:41:49 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=320efbee app-emulation/qemu: sync live Signed-off-by: John Helmert III gentoo.org> app-emulation/qemu/qemu-9999.ebuild | 49 +++++++++++++++++++++++++------------ 1 file changed, 33 insertions(+), 16 deletions(-) diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild index c15115e71a39..e84304a7ae78 100644 --- a/app-emulation/qemu/qemu-9999.ebuild +++ b/app-emulation/qemu/qemu-9999.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI=8 -PYTHON_COMPAT=( python3_{7,8,9,10} ) +PYTHON_COMPAT=( python3_{8,9,10} ) PYTHON_REQ_USE="ncurses,readline" -FIRMWARE_ABI_VERSION="6.1.0" +FIRMWARE_ABI_VERSION="6.2.0" inherit linux-info toolchain-funcs python-r1 udev fcaps readme.gentoo-r1 \ pax-utils xdg-utils @@ -32,11 +32,11 @@ HOMEPAGE="https://www.qemu.org https://www.linux-kvm.org" LICENSE="GPL-2 LGPL-2 BSD-2" SLOT="0" -IUSE="accessibility +aio alsa bzip2 capstone +caps +curl debug +doc +IUSE="accessibility +aio alsa bpf bzip2 capstone +caps +curl debug +doc +fdt fuse glusterfs gnutls gtk infiniband iscsi io-uring jack jemalloc +jpeg kernel_linux kernel_FreeBSD lzo multipath - ncurses nfs nls numa opengl +oss +pin-upstream-blobs + ncurses nfs nls numa opengl +oss pam +pin-upstream-blobs plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux +slirp smartcard snappy spice ssh static static-user systemtap test udev usb @@ -105,6 +105,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} qemu_softmmu_targets_ppc? ( fdt ) qemu_softmmu_targets_riscv32? ( fdt ) qemu_softmmu_targets_riscv64? ( fdt ) + qemu_softmmu_targets_x86_64? ( fdt ) sdl-image? ( sdl ) static? ( static-user !alsa !gtk !jack !opengl !pulseaudio !plugins !rbd !snappy !udev ) static-user? ( !plugins ) @@ -142,6 +143,7 @@ SOFTMMU_TOOLS_DEPEND=" ) aio? ( dev-libs/libaio[static-libs(+)] ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) + bpf? ( dev-libs/libbpf:= ) bzip2? ( app-arch/bzip2[static-libs(+)] ) capstone? ( dev-libs/capstone:= ) caps? ( sys-libs/libcap-ng[static-libs(+)] ) @@ -157,11 +159,7 @@ SOFTMMU_TOOLS_DEPEND=" x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) - infiniband? ( - sys-fabric/libibumad:=[static-libs(+)] - sys-fabric/libibverbs:=[static-libs(+)] - sys-fabric/librdmacm:=[static-libs(+)] - ) + infiniband? ( sys-cluster/rdma-core[static-libs(+)] ) iscsi? ( net-libs/libiscsi ) io-uring? ( sys-libs/liburing:=[static-libs(+)] ) jack? ( virtual/jack ) @@ -181,6 +179,7 @@ SOFTMMU_TOOLS_DEPEND=" media-libs/mesa[static-libs(+)] media-libs/mesa[egl(+),gbm(+)] ) + pam? ( sys-libs/pam ) png? ( media-libs/libpng:0=[static-libs(+)] ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) @@ -241,8 +240,8 @@ BDEPEND=" sys-apps/texinfo virtual/pkgconfig doc? ( - dev-python/sphinx - dev-python/sphinx_rtd_theme + dev-python/sphinx[${PYTHON_USEDEP}] + dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}] ) gtk? ( nls? ( sys-devel/gettext ) ) test? ( @@ -269,7 +268,10 @@ DEPEND="${CDEPEND} static-user? ( ${ALL_DEPEND} )" RDEPEND="${CDEPEND} acct-group/kvm - selinux? ( sec-policy/selinux-qemu )" + selinux? ( + sec-policy/selinux-qemu + sys-libs/libselinux + )" PATCHES=( "${FILESDIR}"/${PN}-2.11.1-capstone_include_path.patch @@ -445,6 +447,7 @@ qemu_src_configure() { --disable-containers # bug #732972 --disable-guest-agent --disable-strip + --with-git-submodules=ignore # bug #746752: TCG interpreter has a few limitations: # - it does not support FPU @@ -465,11 +468,17 @@ qemu_src_configure() { --cc="$(tc-getCC)" --cxx="$(tc-getCXX)" --host-cc="$(tc-getBUILD_CC)" + $(use_enable alsa) $(use_enable debug debug-info) $(use_enable debug debug-tcg) $(use_enable doc docs) + $(use_enable jack) $(use_enable nls gettext) + $(use_enable oss) + $(use_enable pam auth-pam) $(use_enable plugins) + $(use_enable pulseaudio pa) + $(use_enable selinux) $(use_enable xattr attr) ) @@ -498,9 +507,17 @@ qemu_src_configure() { echo "--disable-${2:-$1}" fi } + # Special case for the malloc flag, because the --disable flag does + # not exist and trying like above will break configuring. + conf_malloc() { + if [[ ! ${buildtype} == "user" ]] ; then + usex "${1}" "--enable-malloc=${1}" "" + fi + } conf_opts+=( $(conf_notuser accessibility brlapi) $(conf_notuser aio linux-aio) + $(conf_softmmu bpf) $(conf_notuser bzip2) $(conf_notuser capstone) $(conf_notuser caps cap-ng) @@ -514,7 +531,7 @@ qemu_src_configure() { $(conf_notuser infiniband rdma) $(conf_notuser iscsi libiscsi) $(conf_notuser io-uring linux-io-uring) - $(conf_notuser jemalloc jemalloc) + $(conf_malloc jemalloc) $(conf_notuser jpeg vnc-jpeg) $(conf_notuser kernel_linux kvm) $(conf_notuser lzo) @@ -571,7 +588,7 @@ qemu_src_configure() { $(usev oss) ) conf_opts+=( - --audio-drv-list=$(printf "%s," "${audio_opts[@]}") + --audio-drv-list=$(IFS=,; echo "${audio_opts[*]}") ) fi