commit:     6bce617346c5714aea9961459d71a6e87af2e1b5
Author:     Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 29 07:26:01 2025 +0000
Commit:     Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
CommitDate: Fri Aug 29 09:30:21 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6bce6173

llvm-runtimes/compiler-rt-sanitizers: remove broken test for glibc 2.38

Upstream marked it to get skipped as UNSUPPORTED:
https://github.com/llvm/llvm-project/commit/deebf6b312227e028dd3258b162306b9cdb21cf7

Included in 19.1.0, make sure it gets skipped in older versions too. It
infinitely hangs the whole emerge.

Signed-off-by: Eli Schwartz <eschwartz <AT> gentoo.org>

 .../compiler-rt-sanitizers-15.0.7-r1.ebuild                      | 7 +++++++
 .../compiler-rt-sanitizers-16.0.6-r1.ebuild                      | 7 +++++++
 .../compiler-rt-sanitizers-17.0.6-r1.ebuild                      | 9 +++++++--
 .../compiler-rt-sanitizers-18.1.8-r6.ebuild                      | 9 +++++++--
 .../compiler-rt-sanitizers/compiler-rt-sanitizers-19.1.7.ebuild  | 2 --
 .../compiler-rt-sanitizers/compiler-rt-sanitizers-20.1.8.ebuild  | 2 --
 .../compiler-rt-sanitizers/compiler-rt-sanitizers-21.1.0.ebuild  | 2 --
 .../compiler-rt-sanitizers-22.0.0.9999.ebuild                    | 2 --
 .../compiler-rt-sanitizers-22.0.0_pre20250820.ebuild             | 2 --
 9 files changed, 28 insertions(+), 14 deletions(-)

diff --git 
a/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-15.0.7-r1.ebuild 
b/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-15.0.7-r1.ebuild
index cc708581a5f2..cc90625548d1 100644
--- 
a/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-15.0.7-r1.ebuild
+++ 
b/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-15.0.7-r1.ebuild
@@ -106,6 +106,13 @@ src_prepare() {
        if use ubsan && ! use cfi; then
                > test/cfi/CMakeLists.txt || die
        fi
+       if has_version -b ">=sys-libs/glibc-2.38"; then
+               # On glibc 2.38, the "nohang" test fails by... hanging.
+               # "fixed" in llvm 19.
+               # https://github.com/google/sanitizers/issues/1733
+               # 
https://github.com/llvm/llvm-project/commit/deebf6b312227e028dd3258b162306b9cdb21cf7
+               rm test/tsan/getline_nohang.cpp || die
+       fi
 
        llvm.org_src_prepare
 }

diff --git 
a/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-16.0.6-r1.ebuild 
b/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-16.0.6-r1.ebuild
index e23a58e49fdd..e90e63cb5f34 100644
--- 
a/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-16.0.6-r1.ebuild
+++ 
b/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-16.0.6-r1.ebuild
@@ -112,6 +112,13 @@ src_prepare() {
                rm test/dfsan/custom.cpp || die
                rm test/dfsan/release_shadow_space.c || die
        fi
+       if has_version -b ">=sys-libs/glibc-2.38"; then
+               # On glibc 2.38, the "nohang" test fails by... hanging.
+               # "fixed" in llvm 19.
+               # https://github.com/google/sanitizers/issues/1733
+               # 
https://github.com/llvm/llvm-project/commit/deebf6b312227e028dd3258b162306b9cdb21cf7
+               rm test/tsan/getline_nohang.cpp || die
+       fi
 
        llvm.org_src_prepare
 }

diff --git 
a/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-17.0.6-r1.ebuild 
b/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-17.0.6-r1.ebuild
index 750aea5240b2..c8df8fbabb40 100644
--- 
a/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-17.0.6-r1.ebuild
+++ 
b/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-17.0.6-r1.ebuild
@@ -105,8 +105,13 @@ src_prepare() {
        if use ubsan && ! use cfi; then
                > test/cfi/CMakeLists.txt || die
        fi
-       # hangs, sigh
-       rm test/tsan/getline_nohang.cpp || die
+       if has_version -b ">=sys-libs/glibc-2.38"; then
+               # On glibc 2.38, the "nohang" test fails by... hanging.
+               # "fixed" in llvm 19.
+               # https://github.com/google/sanitizers/issues/1733
+               # 
https://github.com/llvm/llvm-project/commit/deebf6b312227e028dd3258b162306b9cdb21cf7
+               rm test/tsan/getline_nohang.cpp || die
+       fi
 
        llvm.org_src_prepare
 }

diff --git 
a/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-18.1.8-r6.ebuild 
b/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-18.1.8-r6.ebuild
index 0098cadd0542..8adf5792fd25 100644
--- 
a/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-18.1.8-r6.ebuild
+++ 
b/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-18.1.8-r6.ebuild
@@ -101,8 +101,13 @@ src_prepare() {
        if use ubsan && ! use cfi; then
                > test/cfi/CMakeLists.txt || die
        fi
-       # hangs, sigh
-       rm test/tsan/getline_nohang.cpp || die
+       if has_version -b ">=sys-libs/glibc-2.38"; then
+               # On glibc 2.38, the "nohang" test fails by... hanging.
+               # "fixed" in llvm 19.
+               # https://github.com/google/sanitizers/issues/1733
+               # 
https://github.com/llvm/llvm-project/commit/deebf6b312227e028dd3258b162306b9cdb21cf7
+               rm test/tsan/getline_nohang.cpp || die
+       fi
 
        llvm.org_src_prepare
 }

diff --git 
a/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-19.1.7.ebuild 
b/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-19.1.7.ebuild
index 8323457069c5..d5936068acb4 100644
--- a/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-19.1.7.ebuild
+++ b/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-19.1.7.ebuild
@@ -103,8 +103,6 @@ src_prepare() {
        if use ubsan && ! use cfi; then
                > test/cfi/CMakeLists.txt || die
        fi
-       # hangs, sigh
-       rm test/tsan/getline_nohang.cpp || die
 
        llvm.org_src_prepare
 }

diff --git 
a/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-20.1.8.ebuild 
b/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-20.1.8.ebuild
index de0decaa4f10..c6ab939b7ab1 100644
--- a/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-20.1.8.ebuild
+++ b/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-20.1.8.ebuild
@@ -103,8 +103,6 @@ src_prepare() {
        if use ubsan && ! use cfi; then
                > test/cfi/CMakeLists.txt || die
        fi
-       # hangs, sigh
-       rm test/tsan/getline_nohang.cpp || die
 
        llvm.org_src_prepare
 }

diff --git 
a/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-21.1.0.ebuild 
b/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-21.1.0.ebuild
index 4b0884c09ab2..3f1c0f8ccec8 100644
--- a/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-21.1.0.ebuild
+++ b/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-21.1.0.ebuild
@@ -102,8 +102,6 @@ src_prepare() {
        if use ubsan && ! use cfi; then
                > test/cfi/CMakeLists.txt || die
        fi
-       # hangs, sigh
-       rm test/tsan/getline_nohang.cpp || die
 
        llvm.org_src_prepare
 }

diff --git 
a/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-22.0.0.9999.ebuild
 
b/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-22.0.0.9999.ebuild
index b6f74f8ebb9a..333dd678b31e 100644
--- 
a/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-22.0.0.9999.ebuild
+++ 
b/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-22.0.0.9999.ebuild
@@ -101,8 +101,6 @@ src_prepare() {
        if use ubsan && ! use cfi; then
                > test/cfi/CMakeLists.txt || die
        fi
-       # hangs, sigh
-       rm test/tsan/getline_nohang.cpp || die
 
        llvm.org_src_prepare
 }

diff --git 
a/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-22.0.0_pre20250820.ebuild
 
b/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-22.0.0_pre20250820.ebuild
index b6f74f8ebb9a..333dd678b31e 100644
--- 
a/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-22.0.0_pre20250820.ebuild
+++ 
b/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-22.0.0_pre20250820.ebuild
@@ -101,8 +101,6 @@ src_prepare() {
        if use ubsan && ! use cfi; then
                > test/cfi/CMakeLists.txt || die
        fi
-       # hangs, sigh
-       rm test/tsan/getline_nohang.cpp || die
 
        llvm.org_src_prepare
 }

Reply via email to