diff options
| author |   WANG Xuerui <xen0n@gentoo.org> | 2022-07-05 08:52:11 +0800 |
|---|---|---|
| committer | WANG Xuerui <xen0n@gentoo.org> | 2022-07-05 08:53:54 +0800 |
| commit | 62ef6e8524251a91d96e54f11c87a485b25c5f70 (patch) | |
| tree | 674f7aecbc76b42c837997eb89625458ed669f38 /app-emulation/qemu | |
| parent | app-emulation/qemu: update configure option corresponding to USE=png (diff) | |
| download | gentoo-62ef6e8524251a91d96e54f11c87a485b25c5f70.tar.gz gentoo-62ef6e8524251a91d96e54f11c87a485b25c5f70.tar.bz2 gentoo-62ef6e8524251a91d96e54f11c87a485b25c5f70.zip | |
app-emulation/qemu: forward 7.0.0-also-build-virtfs-proxy-helper.patch to avoid fuzz
Due to upstream commit https://gitlab.com/qemu-project/qemu/-/commit/622d64fffe4f
("meson, configure: move bdrv whitelists to meson").
Signed-off-by: WANG Xuerui <xen0n@gentoo.org>
Diffstat (limited to 'app-emulation/qemu')
| -rw-r--r-- | app-emulation/qemu/files/qemu-7.1.0-also-build-virtfs-proxy-helper.patch | 32 | ||||
| -rw-r--r-- | app-emulation/qemu/qemu-9999.ebuild | 2 |
2 files changed, 33 insertions, 1 deletions
diff --git a/app-emulation/qemu/files/qemu-7.1.0-also-build-virtfs-proxy-helper.patch b/app-emulation/qemu/files/qemu-7.1.0-also-build-virtfs-proxy-helper.patch new file mode 100644 index 000000000000..b6f3078a6906 --- /dev/null +++ b/app-emulation/qemu/files/qemu-7.1.0-also-build-virtfs-proxy-helper.patch @@ -0,0 +1,32 @@ +From d02ea89239768c93651a161d057f2bf04d56a024 Mon Sep 17 00:00:00 2001 +From: Matthias Maier <tamiko@43-1.org> +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 65a885ea69..29ce7a5a8e 100644 +--- a/meson.build ++++ b/meson.build +@@ -1684,7 +1684,7 @@ have_virtfs = get_option('virtfs') \ + .disable_auto_if(not have_tools and not have_system) \ + .allowed() + +-have_virtfs_proxy_helper = targetos != 'darwin' and have_virtfs and have_tools ++have_virtfs_proxy_helper = have_tools and libattr.found() and libcap_ng.found() + + if get_option('block_drv_ro_whitelist') == '' + config_host_data.set('CONFIG_BDRV_RO_WHITELIST', '') +-- +2.35.1 + diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild index 8c83655b794e..336c80bd859c 100644 --- a/app-emulation/qemu/qemu-9999.ebuild +++ b/app-emulation/qemu/qemu-9999.ebuild @@ -278,7 +278,7 @@ PATCHES=( "${FILESDIR}"/${PN}-2.11.1-capstone_include_path.patch "${FILESDIR}"/${PN}-5.2.0-disable-keymap.patch "${FILESDIR}"/${PN}-6.0.0-make.patch - "${FILESDIR}"/${PN}-7.0.0-also-build-virtfs-proxy-helper.patch + "${FILESDIR}"/${PN}-7.1.0-also-build-virtfs-proxy-helper.patch "${FILESDIR}"/${PN}-7.1.0-strings.patch ) |