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 1C02E13933E for ; Sun, 18 Jul 2021 15:48:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5B307E0CC9; Sun, 18 Jul 2021 15:47:59 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 33C03E0CC9 for ; Sun, 18 Jul 2021 15:47:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 5E108342ABA for ; Sun, 18 Jul 2021 15:47:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 77E6E78A for ; Sun, 18 Jul 2021 15:47:55 +0000 (UTC) From: "Jory Pratt" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jory Pratt" Message-ID: <1626623269.14d1508edf3d4d65da93394799888b628b0766dc.anarchy@gentoo> Subject: [gentoo-commits] proj/musl:master commit in: app-emulation/qemu/files/, app-emulation/qemu/ X-VCS-Repository: proj/musl X-VCS-Files: app-emulation/qemu/files/qemu-6.0.0-make.patch app-emulation/qemu/metadata.xml app-emulation/qemu/qemu-6.0.0-r2.ebuild app-emulation/qemu/qemu-6.0.0.ebuild X-VCS-Directories: app-emulation/qemu/ app-emulation/qemu/files/ X-VCS-Committer: anarchy X-VCS-Committer-Name: Jory Pratt X-VCS-Revision: 14d1508edf3d4d65da93394799888b628b0766dc X-VCS-Branch: master Date: Sun, 18 Jul 2021 15:47:55 +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: b6a40377-2391-4569-8547-18543d2a7677 X-Archives-Hash: 116f091ba43c4efb819d22e1d748ec0d commit: 14d1508edf3d4d65da93394799888b628b0766dc Author: Jory Pratt gentoo org> AuthorDate: Sun Jul 18 15:47:49 2021 +0000 Commit: Jory Pratt gentoo org> CommitDate: Sun Jul 18 15:47:49 2021 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=14d1508e app-emulation/qemu: sync with ::gentoo Package-Manager: Portage-3.0.20, Repoman-3.0.2 Signed-off-by: Jory Pratt gentoo.org> app-emulation/qemu/files/qemu-6.0.0-make.patch | 14 ++++++++++++++ app-emulation/qemu/metadata.xml | 5 +++-- .../qemu/{qemu-6.0.0.ebuild => qemu-6.0.0-r2.ebuild} | 14 +++++++++----- 3 files changed, 26 insertions(+), 7 deletions(-) diff --git a/app-emulation/qemu/files/qemu-6.0.0-make.patch b/app-emulation/qemu/files/qemu-6.0.0-make.patch new file mode 100644 index 0000000..2dac1ca --- /dev/null +++ b/app-emulation/qemu/files/qemu-6.0.0-make.patch @@ -0,0 +1,14 @@ +Allow MAKE='make V=1' and similar. + +https://bugs.gentoo.org/795678 +--- a/configure ++++ b/configure +@@ -1953,7 +1953,7 @@ if test -z "$python" + then + error_exit "Python not found. Use --python=/path/to/python" + fi +-if ! has "$make" ++if ! has $make + then + error_exit "GNU make ($make) not found" + fi diff --git a/app-emulation/qemu/metadata.xml b/app-emulation/qemu/metadata.xml index ec3f45a..4245f6d 100644 --- a/app-emulation/qemu/metadata.xml +++ b/app-emulation/qemu/metadata.xml @@ -6,8 +6,8 @@ Matthias Maier - slyfox@gentoo.org - Sergei Trofimovich + zlogene@gentoo.org + Mikle Kolyada virtualization@gentoo.org @@ -20,6 +20,7 @@ Enable disassembly support with dev-libs/capstone Support ISOs / -cdrom directives via HTTP or HTTPS. Enables firmware device tree support + Enables FUSE block device export Enables GlusterFS cluster fileystem via sys-cluster/glusterfs Enable TLS support for the VNC console server. diff --git a/app-emulation/qemu/qemu-6.0.0.ebuild b/app-emulation/qemu/qemu-6.0.0-r2.ebuild similarity index 98% rename from app-emulation/qemu/qemu-6.0.0.ebuild rename to app-emulation/qemu/qemu-6.0.0-r2.ebuild index 5c2c7c2..0583c6b 100644 --- a/app-emulation/qemu/qemu-6.0.0.ebuild +++ b/app-emulation/qemu/qemu-6.0.0-r2.ebuild @@ -9,7 +9,7 @@ PYTHON_REQ_USE="ncurses,readline" FIRMWARE_ABI_VERSION="5.2.0-r50" inherit eutils linux-info toolchain-funcs multilib python-r1 -inherit udev fcaps readme.gentoo-r1 pax-utils l10n xdg-utils +inherit udev fcaps readme.gentoo-r1 pax-utils xdg-utils if [[ ${PV} = *9999* ]]; then EGIT_REPO_URI="https://git.qemu.org/git/qemu.git" @@ -23,7 +23,7 @@ if [[ ${PV} = *9999* ]]; then SRC_URI="" else SRC_URI="https://download.qemu.org/${P}.tar.xz" - KEYWORDS="amd64 arm64 ~ppc ppc64 ~x86" + KEYWORDS="amd64 arm64 ~ppc ppc64 x86" fi DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools" @@ -33,7 +33,7 @@ LICENSE="GPL-2 LGPL-2 BSD-2" SLOT="0" IUSE="accessibility +aio alsa bzip2 capstone +caps +curl debug +doc - +fdt glusterfs gnutls gtk infiniband iscsi io-uring + +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 @@ -108,6 +108,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} qemu_softmmu_targets_ppc? ( fdt ) qemu_softmmu_targets_riscv32? ( fdt ) qemu_softmmu_targets_riscv64? ( fdt ) + sdl-image? ( sdl ) static? ( static-user !alsa !gtk !jack !opengl !pulseaudio !plugins !rbd !snappy ) static-user? ( !plugins ) vhost-user-fs? ( caps seccomp ) @@ -149,6 +150,7 @@ SOFTMMU_TOOLS_DEPEND=" caps? ( sys-libs/libcap-ng[static-libs(+)] ) curl? ( >=net-misc/curl-7.15.4[static-libs(+)] ) fdt? ( >=sys-apps/dtc-1.5.0[static-libs(+)] ) + fuse? ( >=sys-fs/fuse-3.1:3[static-libs(+)] ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] ) gnutls? ( dev-libs/nettle:=[static-libs(+)] @@ -171,8 +173,8 @@ SOFTMMU_TOOLS_DEPEND=" lzo? ( dev-libs/lzo:2[static-libs(+)] ) multipath? ( sys-fs/multipath-tools ) ncurses? ( - sys-libs/ncurses:0=[unicode] - sys-libs/ncurses:0=[static-libs(+)] + sys-libs/ncurses:=[unicode(+)] + sys-libs/ncurses:=[static-libs(+)] ) nfs? ( >=net-fs/libnfs-1.9.3:=[static-libs(+)] ) numa? ( sys-process/numactl[static-libs(+)] ) @@ -274,6 +276,7 @@ PATCHES=( "${FILESDIR}"/${PN}-5.2.0-cleaner-werror.patch "${FILESDIR}"/${PN}-5.2.0-disable-keymap.patch "${FILESDIR}"/${PN}-5.2.0-dce-locks.patch + "${FILESDIR}"/${PN}-6.0.0-make.patch ) QA_PREBUILT=" @@ -521,6 +524,7 @@ qemu_src_configure() { $(conf_notuser caps cap-ng) $(conf_notuser curl) $(conf_notuser fdt) + $(conf_notuser fuse) $(conf_notuser glusterfs) $(conf_notuser gnutls) $(conf_notuser gnutls nettle)