[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/, app-emulation/qemu/files/

["Georgy Yakovlev" <gyakovlev@gentoo.org>]

commit:     8c0117c390c33c98bcad3f7edeadf717ece1b0f9
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 16 19:38:20 2022 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Fri Sep 16 19:41:30 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c0117c3

app-emulation/qemu: fix build on ppc (or any softmmu-only arch)

Acked-by: John Helmert III <ajak <AT> gentoo.org>
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 .../qemu/files/qemu-7.0.0-have-user-meson.patch    | 36 ++++++++++++++++++++++
 app-emulation/qemu/qemu-7.0.0-r1.ebuild            |  1 +
 app-emulation/qemu/qemu-7.0.0-r2.ebuild            |  1 +
 app-emulation/qemu/qemu-7.0.0-r3.ebuild            |  1 +
 4 files changed, 39 insertions(+)

diff --git a/app-emulation/qemu/files/qemu-7.0.0-have-user-meson.patch b/app-emulation/qemu/files/qemu-7.0.0-have-user-meson.patch
new file mode 100644
index 000000000000..2acf73cff86e
--- /dev/null
+++ b/app-emulation/qemu/files/qemu-7.0.0-have-user-meson.patch
@@ -0,0 +1,36 @@
+From 2296b4655694744f7c8dcdc9440c21d86e19968e Mon Sep 17 00:00:00 2001
+From: Thomas Huth <thuth@redhat.com>
+Date: Wed, 22 Jun 2022 16:03:28 +0200
+Subject: [PATCH] common-user: Only compile the common user code if have_user
+ is set
+
+There is no need to waste cycles here if we only compile the system
+binaries or tools. Additionally, this change is even a hard requirement
+for building the tools on systems that do not have an entry in the
+common-user/host/ folder (since common-user/meson.build is trying
+to add such a path via the include_directories() command).
+
+Reported-by: Michael Tokarev <mjt@tls.msk.ru>
+Signed-off-by: Thomas Huth <thuth@redhat.com>
+Reviewed-by: Zhang Chen <chen.zhang@intel.com>
+Message-Id: <20220622140328.383961-1-thuth@redhat.com>
+Signed-off-by: Laurent Vivier <laurent@vivier.eu>
+---
+ common-user/meson.build | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/common-user/meson.build b/common-user/meson.build
+index 26212dda5c..ac9de5b9e3 100644
+--- a/common-user/meson.build
++++ b/common-user/meson.build
+@@ -1,3 +1,7 @@
++if not have_user
++   subdir_done()
++endif
++
+ common_user_inc += include_directories('host/' / host_arch)
+ 
+ user_ss.add(files(
+-- 
+GitLab
+

diff --git a/app-emulation/qemu/qemu-7.0.0-r1.ebuild b/app-emulation/qemu/qemu-7.0.0-r1.ebuild
index 10bff2d0b799..36a66123268a 100644
--- a/app-emulation/qemu/qemu-7.0.0-r1.ebuild
+++ b/app-emulation/qemu/qemu-7.0.0-r1.ebuild
@@ -279,6 +279,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-6.0.0-make.patch
 	"${FILESDIR}"/${PN}-6.1.0-strings.patch
 	"${FILESDIR}"/${PN}-7.0.0-also-build-virtfs-proxy-helper.patch
+	"${FILESDIR}"/${PN}-7.0.0-have-user-meson.patch
 )
 
 QA_PREBUILT="

diff --git a/app-emulation/qemu/qemu-7.0.0-r2.ebuild b/app-emulation/qemu/qemu-7.0.0-r2.ebuild
index f048b6385812..32f9865afe5c 100644
--- a/app-emulation/qemu/qemu-7.0.0-r2.ebuild
+++ b/app-emulation/qemu/qemu-7.0.0-r2.ebuild
@@ -281,6 +281,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-7.0.0-also-build-virtfs-proxy-helper.patch
 	"${FILESDIR}"/${P}-virtio-scsi-fixes.patch
 	"${FILESDIR}"/${P}-pci-overflow-fortify-source-3.patch
+	"${FILESDIR}"/${PN}-7.0.0-have-user-meson.patch
 )
 
 QA_PREBUILT="

diff --git a/app-emulation/qemu/qemu-7.0.0-r3.ebuild b/app-emulation/qemu/qemu-7.0.0-r3.ebuild
index a44b77c855f1..d484cdf35ab1 100644
--- a/app-emulation/qemu/qemu-7.0.0-r3.ebuild
+++ b/app-emulation/qemu/qemu-7.0.0-r3.ebuild
@@ -302,6 +302,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-virtio-scsi-fixes.patch
 	"${FILESDIR}"/${P}-pci-overflow-fortify-source-3.patch
 	"${FILESDIR}"/${P}-glibc-2.36.patch
+	"${FILESDIR}"/${PN}-7.0.0-have-user-meson.patch
 )
 
 QA_PREBUILT="