[gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/

[Mike Gilbert]

commit:     5f3d40981d25130e09e0defb0841c2da3ccc595e
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Fri Jul  5 15:14:33 2024 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Fri Jul  5 15:15:14 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f3d4098

sys-apps/systemd: disable vmspawn on arches with no support

Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 sys-apps/systemd/systemd-256.1-r3.ebuild | 9 ++++++++-
 sys-apps/systemd/systemd-9999.ebuild     | 9 ++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/sys-apps/systemd/systemd-256.1-r3.ebuild 
b/sys-apps/systemd/systemd-256.1-r3.ebuild
index 78f1f78f01df..8c37a752ba7f 100644
--- a/sys-apps/systemd/systemd-256.1-r3.ebuild
+++ b/sys-apps/systemd/systemd-256.1-r3.ebuild
@@ -368,9 +368,16 @@ multilib_src_configure() {
                $(meson_native_true timesyncd)
                $(meson_native_true tmpfiles)
                $(meson_native_true vconsole)
-               $(meson_native_enabled vmspawn)
        )
 
+       case $(tc-arch) in
+               amd64|arm|arm64|loong|ppc|ppc64|riscv|s390|x86)
+                       # src/vmspawn/vmspawn-util.h: QEMU_MACHINE_TYPE
+                       myconf+=( $(meson_native_enabled vmspawn) ) ;;
+               *)
+                       myconf+=( -Dvmspawn=disabled ) ;;
+       esac
+
        meson_src_configure "${myconf[@]}"
 }
 

diff --git a/sys-apps/systemd/systemd-9999.ebuild 
b/sys-apps/systemd/systemd-9999.ebuild
index 78f1f78f01df..8c37a752ba7f 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -368,9 +368,16 @@ multilib_src_configure() {
                $(meson_native_true timesyncd)
                $(meson_native_true tmpfiles)
                $(meson_native_true vconsole)
-               $(meson_native_enabled vmspawn)
        )
 
+       case $(tc-arch) in
+               amd64|arm|arm64|loong|ppc|ppc64|riscv|s390|x86)
+                       # src/vmspawn/vmspawn-util.h: QEMU_MACHINE_TYPE
+                       myconf+=( $(meson_native_enabled vmspawn) ) ;;
+               *)
+                       myconf+=( -Dvmspawn=disabled ) ;;
+       esac
+
        meson_src_configure "${myconf[@]}"
 }