sys-libs/compiler-rt-sanitizers: Add new glibc fixes to live ebuilds

diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-7.0.9999.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-7.0.9999.ebuild
index 3028242fe9f664b4c7e58bdc05f5215027b8e4a4..9635d97c11905b018cc9db65e90b374b1a0db35e 100644 (file)
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-7.0.9999.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-7.0.9999.ebuild
@@ -75,8 +75,12 @@ src_unpack() {
 src_prepare() {
        cmake-utils_src_prepare
 
+       # apply the fixes for new glibc / split tirpc
+       eapply "${FILESDIR}/9999/0001-sanitizer_common-Fix-using-libtirpc-on-Linux.patch"
+       eapply "${FILESDIR}/9999/0002-test-Support-using-libtirpc-on-Linux.patch"
+
        if use test; then
-               # remove tests that are broken by new glibc
+               # remove tests that are (still) broken by new glibc
                # https://bugs.llvm.org/show_bug.cgi?id=36065
                if use elibc_glibc && has_version '>=sys-libs/glibc-2.25'; then
                        rm test/lsan/TestCases/Linux/use_tls_dynamic.cc || die

diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9999.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9999.ebuild
index 6d2a4a7a40b7a6193e08f8b1462e5250a597098c..e50fb3c855abb65f10032fb5273d3613e5edca5e 100644 (file)
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9999.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9999.ebuild
@@ -74,8 +74,12 @@ src_unpack() {
 src_prepare() {
        cmake-utils_src_prepare
 
+       # apply the fixes for new glibc / split tirpc
+       eapply "${FILESDIR}/9999/0001-sanitizer_common-Fix-using-libtirpc-on-Linux.patch"
+       eapply "${FILESDIR}/9999/0002-test-Support-using-libtirpc-on-Linux.patch"
+
        if use test; then
-               # remove tests that are broken by new glibc
+               # remove tests that are (still) broken by new glibc
                # https://bugs.llvm.org/show_bug.cgi?id=36065
                if use elibc_glibc && has_version '>=sys-libs/glibc-2.25'; then
                        rm test/lsan/TestCases/Linux/use_tls_dynamic.cc || die