commit:     7c8f76d4af9313f622992a0c9e94f8b686571111
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 16 15:11:58 2026 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 16 15:12:46 2026 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c8f76d4

sys-libs/glibc: disable systemtap for cross

Users may have USE=systemtap enabled globally which will fail when
building cross-*/glibc w/ crossdev because systemtap isn't part
of the cross toolchain. I think it's unlikely anyone will want it
for this anyway.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-libs/glibc/glibc-2.43.ebuild | 7 ++++++-
 sys-libs/glibc/glibc-9999.ebuild | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/sys-libs/glibc/glibc-2.43.ebuild b/sys-libs/glibc/glibc-2.43.ebuild
index 6d6c1002f249..30c75b274204 100644
--- a/sys-libs/glibc/glibc-2.43.ebuild
+++ b/sys-libs/glibc/glibc-2.43.ebuild
@@ -1105,7 +1105,6 @@ glibc_do_configure() {
                --with-bugurl=https://bugs.gentoo.org/
                --with-pkgversion="$(glibc_banner)"
                $(use_multiarch || echo --disable-multi-arch)
-               $(use_enable systemtap)
                $(use_enable nscd)
 
                # /usr/bin/mtrace has a Perl shebang. Gentoo Prefix QA checks 
fail if
@@ -1131,6 +1130,12 @@ glibc_do_configure() {
        # We rely on sys-libs/timezone-data for timezone tools normally.
        myconf+=( $(use_enable vanilla timezone-tools) )
 
+       if is_crosscompile ; then
+               myconf+=( --disable-systemtap )
+       else
+               myconf+=( $(use_enable systemtap) )
+       fi
+
        # These libs don't have configure flags.
        ac_cv_lib_audit_audit_log_user_avc_message=$(usex audit || echo no)
        ac_cv_lib_cap_cap_init=$(usex caps || echo no)

diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
index 8b4b57358721..d4df209dbfbb 100644
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-9999.ebuild
@@ -1105,7 +1105,6 @@ glibc_do_configure() {
                --with-bugurl=https://bugs.gentoo.org/
                --with-pkgversion="$(glibc_banner)"
                $(use_multiarch || echo --disable-multi-arch)
-               $(use_enable systemtap)
                $(use_enable nscd)
 
                # /usr/bin/mtrace has a Perl shebang. Gentoo Prefix QA checks 
fail if
@@ -1131,6 +1130,12 @@ glibc_do_configure() {
        # We rely on sys-libs/timezone-data for timezone tools normally.
        myconf+=( $(use_enable vanilla timezone-tools) )
 
+       if is_crosscompile ; then
+               myconf+=( --disable-systemtap )
+       else
+               myconf+=( $(use_enable systemtap) )
+       fi
+
        # These libs don't have configure flags.
        ac_cv_lib_audit_audit_log_user_avc_message=$(usex audit || echo no)
        ac_cv_lib_cap_cap_init=$(usex caps || echo no)

Reply via email to