commit:     49f1aeb65e1360a091c92d14366126064379f34e
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 19 22:22:13 2026 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Thu Feb 19 22:26:39 2026 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49f1aeb6

sys-apps/systemd: Add riscv32 workaround

Bug: https://bugs.gentoo.org/969103
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 sys-apps/systemd/systemd-259.1.ebuild | 8 +++++++-
 sys-apps/systemd/systemd-9999.ebuild  | 8 +++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/sys-apps/systemd/systemd-259.1.ebuild 
b/sys-apps/systemd/systemd-259.1.ebuild
index 73bcaf2ebbf2..1750925132cd 100644
--- a/sys-apps/systemd/systemd-259.1.ebuild
+++ b/sys-apps/systemd/systemd-259.1.ebuild
@@ -345,7 +345,6 @@ multilib_src_configure() {
                $(meson_native_use_feature kmod)
                $(meson_feature lz4)
                $(meson_feature lzma xz)
-               $(meson_use test tests)
                $(meson_feature zstd)
                $(meson_native_use_feature iptables libiptc)
                $(meson_native_use_feature openssl)
@@ -389,6 +388,13 @@ multilib_src_configure() {
                $(meson_native_true vconsole)
        )
 
+       # workaround for bug 969103
+       if [[ ${CHOST} == riscv32* ]] ; then
+               myconf+=( -Dtests=true )
+       else
+               myconf+=( $(meson_use test tests) )
+       fi
+
        case $(tc-arch) in
                amd64|arm|arm64|loong|ppc|ppc64|riscv|s390|x86)
                        # src/vmspawn/vmspawn-util.h: QEMU_MACHINE_TYPE

diff --git a/sys-apps/systemd/systemd-9999.ebuild 
b/sys-apps/systemd/systemd-9999.ebuild
index cf5a19b01c58..5a6103b359b1 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -344,7 +344,6 @@ multilib_src_configure() {
                $(meson_native_use_feature kmod)
                $(meson_feature lz4)
                $(meson_feature lzma xz)
-               $(meson_use test tests)
                $(meson_feature zstd)
                $(meson_native_use_feature iptables libiptc)
                $(meson_native_use_feature openssl)
@@ -388,6 +387,13 @@ multilib_src_configure() {
                $(meson_native_true vconsole)
        )
 
+       # workaround for bug 969103
+       if [[ ${CHOST} == riscv32* ]] ; then
+               myconf+=( -Dtests=true )
+       else
+               myconf+=( $(meson_use test tests) )
+       fi
+
        case $(tc-arch) in
                amd64|arm|arm64|loong|ppc|ppc64|riscv|s390|x86)
                        # src/vmspawn/vmspawn-util.h: QEMU_MACHINE_TYPE

Reply via email to