commit: 0254a02c985973583c21db71b308d3b6bf93cf2b
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 11 13:32:11 2022 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Tue Jan 11 13:40:41 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0254a02c
app-emulation/qemu: always build virtfs-proxy-helper tool
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>
...qemu-6.2.0-also-build-virtfs-proxy-helper.patch | 32 ++++++++++++++++++++++
.../{qemu-6.2.0-r2.ebuild => qemu-6.2.0-r3.ebuild} | 1 +
app-emulation/qemu/qemu-9999.ebuild | 1 +
3 files changed, 34 insertions(+)
diff --git
a/app-emulation/qemu/files/qemu-6.2.0-also-build-virtfs-proxy-helper.patch
b/app-emulation/qemu/files/qemu-6.2.0-also-build-virtfs-proxy-helper.patch
new file mode 100644
index 000000000000..b6af46552fe5
--- /dev/null
+++ b/app-emulation/qemu/files/qemu-6.2.0-also-build-virtfs-proxy-helper.patch
@@ -0,0 +1,32 @@
+From 42e53a0aadb76dfa7c11cd3b14eb4a41efba9bbe Mon Sep 17 00:00:00 2001
+From: Matthias Maier <tam...@43-1.org>
+Date: Tue, 11 Jan 2022 07:20:31 -0600
+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 fbe856700..d6918b04c 100644
+--- a/meson.build
++++ b/meson.build
+@@ -1390,7 +1390,7 @@ have_virtfs = (targetos == 'linux' and
+ libattr.found() and
+ libcap_ng.found())
+
+-have_virtfs_proxy_helper = have_virtfs and have_tools
++have_virtfs_proxy_helper = have_tools
+
+ if get_option('virtfs').enabled()
+ if not have_virtfs
+--
+2.34.1
+
diff --git a/app-emulation/qemu/qemu-6.2.0-r2.ebuild
b/app-emulation/qemu/qemu-6.2.0-r3.ebuild
similarity index 99%
rename from app-emulation/qemu/qemu-6.2.0-r2.ebuild
rename to app-emulation/qemu/qemu-6.2.0-r3.ebuild
index 10b0bf44d7de..6ca062e88457 100644
--- a/app-emulation/qemu/qemu-6.2.0-r2.ebuild
+++ b/app-emulation/qemu/qemu-6.2.0-r3.ebuild
@@ -279,6 +279,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-6.0.0-make.patch
"${FILESDIR}"/${PN}-6.1.0-strings.patch
"${FILESDIR}"/${PN}-6.2.0-user-SLIC-crash.patch
+ "${FILESDIR}"/${PN}-6.2.0-also-build-virtfs-proxy-helper.patch
)
QA_PREBUILT="
diff --git a/app-emulation/qemu/qemu-9999.ebuild
b/app-emulation/qemu/qemu-9999.ebuild
index 7f3efa61e35b..d81060ed102b 100644
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@@ -278,6 +278,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
)
QA_PREBUILT="
