Skip to contentSkip to conversation

common-user: Only compile the common user code if have_user is set

PATCH Applied Thomas Huth 3 participants 3 messages Jun 22, 2022 – Jun 28, 2022 Arm/Amlogic Meson SoC support

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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).

---
 common-user/meson.build | 4 ++++
 1 file changed, 4 insertions(+)
common-user/meson.build +4 -0
index 26212dda5c..ac9de5b9e3 100644
@@ -1,3 +1,7 @@
+if not have_user
+   subdir_done()
+endif
+
 common_user_inc += include_directories('host/' / host_arch)
 
 user_ss.add(files(
Signature · 1 line
2.31.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 12 lines

-----Original Message-----
From: Qemu-devel <qemu-devel- [email protected]> On Behalf Of Thomas Huth
Sent: Wednesday, June 22, 2022 10:03 PM
To: [email protected]; Riku Voipio <[email protected]>
Cc: Michael Tokarev <[email protected]>; [email protected]; Paolo Bonzini <[email protected]>
Subject: [PATCH] common-user: Only compile the common user code if have_user is set

Quoted 8 lines

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).

Looks good to me.

Quoted 19 lines
---
 common-user/meson.build | 4 ++++
 1 file changed, 4 insertions(+)
common-user/meson.build index renamed from common-user/meson.build +0 -0

26212dda5c..ac9de5b9e3 100644

common-user/meson.build +4 -1
@@ -1,3 +1,7 @@
+if not have_user
+   subdir_done()
+endif
+
 common_user_inc += include_directories('host/' / host_arch)
 
 user_ss.add(files(
--

2.31.1

#2 lore raw
In reply to Thomas Huth

Le 22/06/2022 à 16:03, Thomas Huth a écrit :

Quoted 17 lines

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).

---
  common-user/meson.build | 4 ++++
  1 file changed, 4 insertions(+)
common-user/meson.build +0 -0
index 26212dda5c..ac9de5b9e3 100644

common-user/meson.build line 7

Quoted 7 lines
common-user/meson.build +4 -0
@@ -1,3 +1,7 @@
+if not have_user
+   subdir_done()
+endif
+
  common_user_inc += include_directories('host/' / host_arch)
 
  user_ss.add(files(

Applied to my trivial-patches branch.

Thanks,
Laurent