From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 81BCC1382C5 for ; Mon, 1 Mar 2021 22:58:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AC069E088D; Mon, 1 Mar 2021 22:58:13 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 82D59E088D for ; Mon, 1 Mar 2021 22:58:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2A8F3340F66 for ; Mon, 1 Mar 2021 22:58:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7860A4E9 for ; Mon, 1 Mar 2021 22:58:10 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1614639486.566059c6b81614bc9640f854f91cab1bc0e724c3.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/compiler-rt-sanitizers/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.0.1.ebuild sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.1.0.ebuild sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-12.0.0.9999.ebuild sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-12.0.0_rc2.ebuild sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.0.9999.ebuild X-VCS-Directories: sys-libs/compiler-rt-sanitizers/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 566059c6b81614bc9640f854f91cab1bc0e724c3 X-VCS-Branch: master Date: Mon, 1 Mar 2021 22:58:10 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 4881aef9-47a6-4a39-8c46-55cc18f5da9c X-Archives-Hash: 06e401e1874cbb6326464fdc9e94e65a commit: 566059c6b81614bc9640f854f91cab1bc0e724c3 Author: Michał Górny gentoo org> AuthorDate: Mon Mar 1 22:56:57 2021 +0000 Commit: Michał Górny gentoo org> CommitDate: Mon Mar 1 22:58:06 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=566059c6 sys-libs/compiler-rt-sanitizers: Relax the component constraints Relax the component constraints to apply only with USE=test. Reverse the constraint between ubsan and cfi -- it is cfi that requires ubsan for its tests to work. At the same time, stub out automagically enabled cfi tests when ubsan is enabled but cfi is not. This should fix impossible constraints on architectures that support ubsan but not cfi. Closes: https://bugs.gentoo.org/773661 Signed-off-by: Michał Górny gentoo.org> .../compiler-rt-sanitizers-11.0.1.ebuild | 11 ++++++++--- .../compiler-rt-sanitizers-11.1.0.ebuild | 11 ++++++++--- .../compiler-rt-sanitizers-12.0.0.9999.ebuild | 11 ++++++++--- .../compiler-rt-sanitizers-12.0.0_rc2.ebuild | 11 ++++++++--- .../compiler-rt-sanitizers-13.0.0.9999.ebuild | 11 ++++++++--- 5 files changed, 40 insertions(+), 15 deletions(-) diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.0.1.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.0.1.ebuild index c7da5f747b3..d139a2006ac 100644 --- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.0.1.ebuild +++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.0.1.ebuild @@ -24,8 +24,10 @@ SANITIZER_FLAGS=( IUSE+=" ${SANITIZER_FLAGS[@]/#/+}" REQUIRED_USE=" || ( ${SANITIZER_FLAGS[*]} libfuzzer profile xray ) - gwp-asan? ( scudo ) - ubsan? ( cfi )" + test? ( + cfi? ( ubsan ) + gwp-asan? ( scudo ) + )" RESTRICT="!test? ( test ) !clang? ( test )" CLANG_SLOT=${SLOT%%.*} @@ -86,10 +88,13 @@ src_prepare() { fi done + # TODO: fix these tests to be skipped upstream if use asan && ! use profile; then - # TODO: fix these tests to be skipped upstream rm test/asan/TestCases/asan_and_llvm_coverage_test.cpp || die fi + if use ubsan && ! use cfi; then + > test/cfi/CMakeLists.txt || die + fi # broken with new glibc sed -i -e '/EXPECT_EQ.*ThreadDescriptorSize/d' \ diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.1.0.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.1.0.ebuild index 5ae20f93336..c877ae4241f 100644 --- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.1.0.ebuild +++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.1.0.ebuild @@ -24,8 +24,10 @@ SANITIZER_FLAGS=( IUSE+=" ${SANITIZER_FLAGS[@]/#/+}" REQUIRED_USE=" || ( ${SANITIZER_FLAGS[*]} libfuzzer profile xray ) - gwp-asan? ( scudo ) - ubsan? ( cfi )" + test? ( + cfi? ( ubsan ) + gwp-asan? ( scudo ) + )" RESTRICT="!test? ( test ) !clang? ( test )" CLANG_SLOT=${SLOT%%.*} @@ -86,10 +88,13 @@ src_prepare() { fi done + # TODO: fix these tests to be skipped upstream if use asan && ! use profile; then - # TODO: fix these tests to be skipped upstream rm test/asan/TestCases/asan_and_llvm_coverage_test.cpp || die fi + if use ubsan && ! use cfi; then + > test/cfi/CMakeLists.txt || die + fi # broken with new glibc sed -i -e '/EXPECT_EQ.*ThreadDescriptorSize/d' \ diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-12.0.0.9999.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-12.0.0.9999.ebuild index 5fc5bbc6247..b9f483144cd 100644 --- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-12.0.0.9999.ebuild +++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-12.0.0.9999.ebuild @@ -24,8 +24,10 @@ SANITIZER_FLAGS=( IUSE+=" ${SANITIZER_FLAGS[@]/#/+}" REQUIRED_USE=" || ( ${SANITIZER_FLAGS[*]} libfuzzer profile xray ) - gwp-asan? ( scudo ) - ubsan? ( cfi )" + test? ( + cfi? ( ubsan ) + gwp-asan? ( scudo ) + )" RESTRICT="!test? ( test ) !clang? ( test )" CLANG_SLOT=${SLOT%%.*} @@ -86,10 +88,13 @@ src_prepare() { fi done + # TODO: fix these tests to be skipped upstream if use asan && ! use profile; then - # TODO: fix these tests to be skipped upstream rm test/asan/TestCases/asan_and_llvm_coverage_test.cpp || die fi + if use ubsan && ! use cfi; then + > test/cfi/CMakeLists.txt || die + fi llvm.org_src_prepare } diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-12.0.0_rc2.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-12.0.0_rc2.ebuild index 5fc5bbc6247..b9f483144cd 100644 --- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-12.0.0_rc2.ebuild +++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-12.0.0_rc2.ebuild @@ -24,8 +24,10 @@ SANITIZER_FLAGS=( IUSE+=" ${SANITIZER_FLAGS[@]/#/+}" REQUIRED_USE=" || ( ${SANITIZER_FLAGS[*]} libfuzzer profile xray ) - gwp-asan? ( scudo ) - ubsan? ( cfi )" + test? ( + cfi? ( ubsan ) + gwp-asan? ( scudo ) + )" RESTRICT="!test? ( test ) !clang? ( test )" CLANG_SLOT=${SLOT%%.*} @@ -86,10 +88,13 @@ src_prepare() { fi done + # TODO: fix these tests to be skipped upstream if use asan && ! use profile; then - # TODO: fix these tests to be skipped upstream rm test/asan/TestCases/asan_and_llvm_coverage_test.cpp || die fi + if use ubsan && ! use cfi; then + > test/cfi/CMakeLists.txt || die + fi llvm.org_src_prepare } diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.0.9999.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.0.9999.ebuild index 5fc5bbc6247..b9f483144cd 100644 --- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.0.9999.ebuild +++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.0.9999.ebuild @@ -24,8 +24,10 @@ SANITIZER_FLAGS=( IUSE+=" ${SANITIZER_FLAGS[@]/#/+}" REQUIRED_USE=" || ( ${SANITIZER_FLAGS[*]} libfuzzer profile xray ) - gwp-asan? ( scudo ) - ubsan? ( cfi )" + test? ( + cfi? ( ubsan ) + gwp-asan? ( scudo ) + )" RESTRICT="!test? ( test ) !clang? ( test )" CLANG_SLOT=${SLOT%%.*} @@ -86,10 +88,13 @@ src_prepare() { fi done + # TODO: fix these tests to be skipped upstream if use asan && ! use profile; then - # TODO: fix these tests to be skipped upstream rm test/asan/TestCases/asan_and_llvm_coverage_test.cpp || die fi + if use ubsan && ! use cfi; then + > test/cfi/CMakeLists.txt || die + fi llvm.org_src_prepare }