commit: 25a4aeed4827c51fb13b41315a9d52c9b4b9de41 Author: Matthias Maier <tamiko <AT> gentoo <DOT> org> AuthorDate: Thu May 18 21:03:43 2023 +0000 Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org> CommitDate: Thu May 18 21:07:10 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25a4aeed
app-emulation/qemu: update live ebuild Thanks to Paolo Bonzini for the update regarding qemu-8.0.0-remove-python-meson-check.patch Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org> ...qemu-8.1.0-also-build-virtfs-proxy-helper.patch | 32 ++++++++++++++++++++++ app-emulation/qemu/qemu-9999.ebuild | 5 ++-- 2 files changed, 34 insertions(+), 3 deletions(-) diff --git a/app-emulation/qemu/files/qemu-8.1.0-also-build-virtfs-proxy-helper.patch b/app-emulation/qemu/files/qemu-8.1.0-also-build-virtfs-proxy-helper.patch new file mode 100644 index 000000000000..61ea0f36d90a --- /dev/null +++ b/app-emulation/qemu/files/qemu-8.1.0-also-build-virtfs-proxy-helper.patch @@ -0,0 +1,32 @@ +From d02ea89239768c93651a161d057f2bf04d56a024 Mon Sep 17 00:00:00 2001 +From: Matthias Maier <[email protected]> +Date: Mon, 4 Apr 2022 12:56:59 +0200 +Subject: [PATCH] also build virtfs-proxy-helper + +The Gentoo ebuild splits the qemu build into a softmmu, user and tool +phase in order to be able to build and link some of the qemu emulators +statically. This unfortunately has the consequence that we never +configure with "have_virtfs" and "have_tools" at the same time. + +As a workaround, simply build the virtfs userland unconditionally. After +all, it is a tiny executable +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 063c736aee..fda8639293 100644 +--- a/meson.build ++++ b/meson.build +@@ -2008,8 +2008,6 @@ have_virtfs = get_option('virtfs') \ + .allowed() + + have_virtfs_proxy_helper = get_option('virtfs_proxy_helper') \ +- .require(targetos != 'darwin', error_message: 'the virtfs proxy helper is incompatible with macOS') \ +- .require(have_virtfs, error_message: 'the virtfs proxy helper requires that virtfs is enabled') \ + .disable_auto_if(not have_tools) \ + .require(libcap_ng.found(), error_message: 'the virtfs proxy helper requires libcap-ng') \ + .allowed() +-- +2.35.1 + diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild index 3129dc21e59e..1446d5189be7 100644 --- a/app-emulation/qemu/qemu-9999.ebuild +++ b/app-emulation/qemu/qemu-9999.ebuild @@ -302,9 +302,8 @@ RDEPEND="${CDEPEND} PATCHES=( "${FILESDIR}"/${PN}-8.0.0-disable-keymap.patch "${FILESDIR}"/${PN}-8.0.0-make.patch - "${FILESDIR}"/${PN}-7.1.0-also-build-virtfs-proxy-helper.patch "${FILESDIR}"/${PN}-7.1.0-capstone-include-path.patch - "${FILESDIR}"/${PN}-8.0.0-remove-python-meson-check.patch + "${FILESDIR}"/${PN}-8.1.0-also-build-virtfs-proxy-helper.patch ) QA_PREBUILT=" @@ -450,7 +449,7 @@ src_prepare() { sed -i -e 's/-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2//' configure || die # Remove bundled modules - rm -r dtc meson roms/*/ || die + rm -r dtc roms/*/ || die } ##
