6 files changed, 43 insertions, 3 deletions
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 619c9415207c..73427c5401ce 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 8a82619d5414..3a6b72adba0e 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -6,6 +6,7 @@ AUX qemu-6.0.0-make.patch 306 BLAKE2B 701c6d929dc7544a2e155243a2545dc488765cf8b7
 AUX qemu-6.1.0-strings.patch 882 BLAKE2B 9c35aca28371c15e037af5e9deaa90edcad769b5346f7c90cbb7768ce5639b1d1d1204933024241b7349573cc94ebca7a85ebaf051a9fb9dab8ea7d87d843ef9 SHA512 fcbf02a38401dbc7612130bb993dbec72468c926f729cd32e822b39fefe446ed8fd0906d6ffd4557181df753a84d77182fa713a5939300f193008532be88ada4
 AUX qemu-7.0.0-also-build-virtfs-proxy-helper.patch 1168 BLAKE2B c85204a90c5af17675c1d2d09ce884acddd0cabb6816d10baafc299a924f86c94fb66b9c58160fe0e4b5d56c049f249c01390d45bebca42aaf941bdc6f04fe81 SHA512 b5a884545bbc82fe2318f18f4de103e61db6d22fce433f4ed4e175310f329fe110627640c6127df0dd2312dcba05bce342ff08166feb565b9adbea23086f1677
 AUX qemu-7.0.0-glibc-2.36.patch 3708 BLAKE2B f65dc18407606ebd30cd865ea7b83401de6d74fef2bc2432e2a50e3035d026f8048d514921af8bf3713ece9895e6657be42417dd2911c142ba4d2c4669a06716 SHA512 8fd0e7f5889ff152e4f3e02cf799e077f2563b91e5ab66c99aa9fe5e6540fa0ba0042f80bd57b904673d118112652bfe44492cb4b1d69baa19936d3386ba6f70
+AUX qemu-7.0.0-have-user-meson.patch 1196 BLAKE2B 8f035e4512327cbf3eb17b5ad5b0af7e80600a2ce41bf072006e86ab16c6f62ded27dec71e9489788c1ff36f76593497548508a0aae0e8ab6b1f77e8bec8d60b SHA512 a0a169b7645574398f170b5015c60bed60b8333b490d576e491ed8a75d356faff690a70438add3dcdff1afa9fa304f8cc89233161fd87aea1cd51a06a3c5cccd
 AUX qemu-7.0.0-pci-overflow-fortify-source-3.patch 3939 BLAKE2B 02909d525e2ff2bc79a763117ccad7fd46eb23ba731ca37d6d6b6d2edcc9aaf02f37d2e13996f1648e9befd13fa50cb14c0d04565196d9ead2ceadcba2610b8b SHA512 0ca086aa4781066133a9a2d0307d6843e0062b17443abffca87af8291569ac2c44ab29408cce5e7a9d05e75ff277f1778347f9ce155e91ea7c6d0eb1d8a2388d
 AUX qemu-7.0.0-virtio-scsi-fixes.patch 7117 BLAKE2B 47f2c2a2783579bccdf0aa509051324a2c269eb9bdad1cad489e40724035cad6958559b46533c9601ffb7bfd2f9fde16117097fd470a3a6fe9b9cf5a0a9f95a8 SHA512 e15418a83b43e9313199d2198ba0434c7130b4c0561a57a244ae783803c8505defdb68ec680e03acaaa0feba3e778d7e6efd4ccec58fa2c49208e4095efe6c31
 AUX qemu-7.1.0-also-build-virtfs-proxy-helper.patch 1167 BLAKE2B dee6c98a547a510827f422a5d2b03edd6d467e4713f357a5841e01d632578891a0e2e715c57153c7842b51f5199cea70d8e76ff31f0372308e26202e1587af62 SHA512 d2fb9db139588961434663910dc7151c91b82c1820f62ed5ae690e4f868f1957d8ad2dc1b812813a2081ce6bbdd0f8e59cddd9459de6ef493df02b5a4478de63
@@ -16,9 +17,9 @@ DIST qemu-7.0.0-docs.tar.xz 5101176 BLAKE2B 827d4af2b3fd229d146b47253d12a8bfd606
 DIST qemu-7.0.0.tar.xz 125117636 BLAKE2B ceda6d9f1a585298bd49fed61e8bb35f0064ad8388a9f979c8bd68a38bfe1a47c5bb055e5f74f970c2c440957042b9de4a861524120040c56e4cd8b56c5cfb68 SHA512 44ecd10c018a3763e1bc87d1d35b98890d0d5636acd69fe9b5cadf5024d5af6a31684d60cbe1c3370e02986434c1fb0ad99224e0e6f6fe7eda169992508157b1
 DIST qemu-7.1.0-docs.tar.xz 2016780 BLAKE2B 1b84361fe58d504ab740a0b805a25d02f497ca776e7251a99f0e98e3720d1a2029b7a171f9d79dd128ba17a82c72d497e09baa1a4b2f192ba390f0f3b1950792 SHA512 7a328303b8af0ab63aa1f0fe07a121d3ca459d00fca817412e645416af795930dbea0a3e60f4ca006a74d1672e84fa4e626e4d83918e0b685b601043d0d8159e
 DIST qemu-7.1.0.tar.xz 121833004 BLAKE2B e05f91ce4993c7591a2df08b5fb017f8b8ec2141ab7bfd55d14730ea6b793ac1091de539992058392a5522d4e58beee92a87752707be58e3619b8213ef9f35bf SHA512 c60c5ff8ec99b7552e485768908920658fdd8035ff7a6fa370fb6881957dc8b7e5f18ff1a8f49bd6aa22909ede2a7c084986d8244f12074ccd33ebe40a0c411f
-EBUILD qemu-7.0.0-r1.ebuild 25838 BLAKE2B 875e737a2d9c56343df88972d479ca661d9cef981d44c8b176e9aa6cee06d578cbf57aa4bd8e5b6396134a91b56de5f6a1f29b6a1903d4ce90f4426b438d8a6b SHA512 f52a03cf93d1faae0fd6363f5797ada9c63138c4adaea5245ccb15d86a997aba1707107c2cda97e4f36b22733bfeb0fe46767b7886c2ec81b275755c95dd1b3a
-EBUILD qemu-7.0.0-r2.ebuild 26304 BLAKE2B 478452308df45bf5f466e644cb732b592e10d9c0d66500b64bf8dd33e3471a3663b774824be2169fa65c4c50dbbd721940753d2fe1c4b65afd413231bc73ff24 SHA512 e7400db9efa895d59b5ecb9df59627439dd9a949c893aaf4d28abb6b69247b79115172f377319cca054b5f068fc1ace20d6666b78a14f786e6dcf444568df16d
-EBUILD qemu-7.0.0-r3.ebuild 27238 BLAKE2B 8a012df9ab00b33e08dba18f4e4053a234997b18fd0d711af3c157cb60cfe91c2de45c61a09db060485ed9ebe171b3c7bd37bef48a429f751862835f87760568 SHA512 aa9cc842fb465002cbdc83ec1f488bb642489262c83677ae590e2ce856f540050dd829f79ce60df3ece2645ac2c274f2ebe406e7c9d9a9336efc33a984b438fa
+EBUILD qemu-7.0.0-r1.ebuild 25887 BLAKE2B b8448330e5bf16d19d0651a4ecf9c26f6693358c0ae598ab35fab3cb65d97f6ac723c511050435c33cc51f8798f77d03b43b886bb8b89ddeb47a43e7009be7c7 SHA512 33d0626618fc2ef49f0b695ed8c334494c7950ea50f5878416e807dd5860ff578861ba4f0164989defc297f0b180b8218db8db78757516c1250139d00336350f
+EBUILD qemu-7.0.0-r2.ebuild 26353 BLAKE2B bccfeba202a1058b355d3e1bbd62e577ee8311b793be1340827ce45fb22ce9e8e34c6495e80914716342b98aa2a5344c1a2af4da5647963bc33fedbb780ef0d1 SHA512 f93f8dcbd17d982b6314f2c7729b86cda21b7068d369cd8e910101a7fce30b9cb0767fedf07d77484d88c31ce126a05e6704684554f8577d42cd495a86b6a724
+EBUILD qemu-7.0.0-r3.ebuild 27287 BLAKE2B 8a9df3cc54a28216bb8084d5556668e6d82b120368932805c7d4e96bfcb554910f581377a9a706a1970c58b066dc3c5dd6bd1ca73ed1f25ac24f926aed6aece6 SHA512 c23862e9e56074bcbba26b29016d03d8dc966a07a9aab241f9e226089afe7a57ad148204eb85a84a3138effbae304a15e63e71fbd590eb64bd80a79dd800ed41
 EBUILD qemu-7.1.0.ebuild 28128 BLAKE2B 0cfcc926cee49d45d75ca23f62bcd5167fda37e2a61e52e1f5292dfa1fc424c39425b8eca0b7a28c4b1c7f9635aaaef68a85e1246e2447124971f66b25afbb21 SHA512 d9c9bb504c86558d6af8e57a97e38fc360b97e6107841707400edbb98f527ef99b04625c471818d27dbe3e75f11fb15957cfac03aec8a58d1f30772cb1c7477e
 EBUILD qemu-9999.ebuild 28117 BLAKE2B 80b963605190cce84f90c0e555dd51c80b021ea53ad7d413f3c541b475a3cd80ff772ff6c7b7d1b6e89aac17facb950bd1430b44e2fd343a66fb68e774db3bec SHA512 5713966a08dfabf954198a0b977dad2647fefddb6a912e635279cc43fd0d831ddd548624e18d562c41e273e98240486bb66b16c9faf0fc6a0046cd6abd8374a7
 MISC metadata.xml 4672 BLAKE2B ea2319ecc6717e4f10667f70928eac2b59eb27bb117957c266984a4d5bdf84604128086956a651c1880d314efde56ce81a67c364f7944f5342b6a322b5e3e73e SHA512 27f357299abc6a82112dab17c81b825459ce4c7afd96381b4cba13d79861f80e7d452d574795cab240e7ca56154128a2597ac9957aa24ef81d7dc9092312ac79
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="