diff options
| author |   Michal Privoznik <mprivozn@redhat.com> | 2022-04-04 13:08:12 +0200 |
|---|---|---|
| committer |   John Helmert III <ajak@gentoo.org> | 2022-04-04 13:44:34 -0500 |
| commit | 991a095934c0cf12cc9aa4420a67a321b1d4e9a2 (patch) | |
| tree | 9aee756e7a1cddfc3032d716099ccd54dbf71f31 /app-emulation/qemu | |
| parent | sys-kernel/gentoo-sources: drop 5.17.0 (diff) | |
| download | gentoo-991a095934c0cf12cc9aa4420a67a321b1d4e9a2.tar.gz gentoo-991a095934c0cf12cc9aa4420a67a321b1d4e9a2.tar.bz2 gentoo-991a095934c0cf12cc9aa4420a67a321b1d4e9a2.zip | |
app-emulation/qemu: Rebase qemu-6.2.0-also-build-virtfs-proxy-helper.patch for live ebuild
Since the upstream moved some stuff in meson.build the original
patch applies no more. Rebase it onto current master.
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Closes: https://github.com/gentoo/gentoo/pull/24898
Signed-off-by: John Helmert III <ajak@gentoo.org>
Diffstat (limited to 'app-emulation/qemu')
| -rw-r--r-- | app-emulation/qemu/files/qemu-7.0.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.0.0-also-build-virtfs-proxy-helper.patch b/app-emulation/qemu/files/qemu-7.0.0-also-build-virtfs-proxy-helper.patch new file mode 100644 index 000000000000..ca2e9433792c --- /dev/null +++ b/app-emulation/qemu/files/qemu-7.0.0-also-build-virtfs-proxy-helper.patch @@ -0,0 +1,32 @@ +From c1093041466772f4b62961bcc5a354801d41355d 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 861de93c4f..a8d29be3aa 100644 +--- a/meson.build ++++ b/meson.build +@@ -1474,7 +1474,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() + + foreach k : get_option('trace_backends') + config_host_data.set('CONFIG_TRACE_' + k.to_upper(), true) +-- +2.35.1 + diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild index 13179f417b18..a8468dde1909 100644 --- a/app-emulation/qemu/qemu-9999.ebuild +++ b/app-emulation/qemu/qemu-9999.ebuild @@ -276,7 +276,7 @@ PATCHES=( "${FILESDIR}"/${PN}-5.2.0-disable-keymap.patch "${FILESDIR}"/${PN}-6.0.0-make.patch "${FILESDIR}"/${PN}-6.1.0-strings.patch - "${FILESDIR}"/${PN}-6.2.0-also-build-virtfs-proxy-helper.patch + "${FILESDIR}"/${PN}-7.0.0-also-build-virtfs-proxy-helper.patch ) QA_PREBUILT=" |