From 10d369d452818efb3b9a3df5412ee39f3f44ee56 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= Date: Fri, 11 Oct 2019 15:46:39 +0200 Subject: [PATCH] sys-devel/clang-runtime: Remove USE=crt from 9+ MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Since LLVM 9.0.0, compiler-rt provides crt* objects. The separate 'crt' flag was provided only to let people choose whether they want to install netbsd-csu on Linux. Remove it and use USE=compiler-rt for both main libs and crt. Closes: https://bugs.gentoo.org/697468 Signed-off-by: Michał Górny --- sys-devel/clang-runtime/clang-runtime-10.0.0.9999.ebuild | 8 +------- sys-devel/clang-runtime/clang-runtime-9.0.0.9999.ebuild | 8 +------- sys-devel/clang-runtime/clang-runtime-9.0.0.ebuild | 8 +------- 3 files changed, 3 insertions(+), 21 deletions(-) diff --git a/sys-devel/clang-runtime/clang-runtime-10.0.0.9999.ebuild b/sys-devel/clang-runtime/clang-runtime-10.0.0.9999.ebuild index 34bd6e203736..806c398483be 100644 --- a/sys-devel/clang-runtime/clang-runtime-10.0.0.9999.ebuild +++ b/sys-devel/clang-runtime/clang-runtime-10.0.0.9999.ebuild @@ -12,7 +12,7 @@ SRC_URI="" LICENSE="metapackage" SLOT="$(ver_cut 1-3)" KEYWORDS="" -IUSE="+compiler-rt crt libcxx openmp +sanitize" +IUSE="+compiler-rt libcxx openmp +sanitize" REQUIRED_USE="sanitize? ( compiler-rt )" PROPERTIES="live" @@ -21,11 +21,5 @@ RDEPEND=" ~sys-libs/compiler-rt-${PV}:${SLOT} sanitize? ( ~sys-libs/compiler-rt-sanitizers-${PV}:${SLOT} ) ) - crt? ( - || ( - sys-libs/netbsd-csu[${MULTILIB_USEDEP}] - sys-freebsd/freebsd-lib[${MULTILIB_USEDEP}] - ) - ) libcxx? ( >=sys-libs/libcxx-${PV}[${MULTILIB_USEDEP}] ) openmp? ( >=sys-libs/libomp-${PV}[${MULTILIB_USEDEP}] )" diff --git a/sys-devel/clang-runtime/clang-runtime-9.0.0.9999.ebuild b/sys-devel/clang-runtime/clang-runtime-9.0.0.9999.ebuild index 34bd6e203736..806c398483be 100644 --- a/sys-devel/clang-runtime/clang-runtime-9.0.0.9999.ebuild +++ b/sys-devel/clang-runtime/clang-runtime-9.0.0.9999.ebuild @@ -12,7 +12,7 @@ SRC_URI="" LICENSE="metapackage" SLOT="$(ver_cut 1-3)" KEYWORDS="" -IUSE="+compiler-rt crt libcxx openmp +sanitize" +IUSE="+compiler-rt libcxx openmp +sanitize" REQUIRED_USE="sanitize? ( compiler-rt )" PROPERTIES="live" @@ -21,11 +21,5 @@ RDEPEND=" ~sys-libs/compiler-rt-${PV}:${SLOT} sanitize? ( ~sys-libs/compiler-rt-sanitizers-${PV}:${SLOT} ) ) - crt? ( - || ( - sys-libs/netbsd-csu[${MULTILIB_USEDEP}] - sys-freebsd/freebsd-lib[${MULTILIB_USEDEP}] - ) - ) libcxx? ( >=sys-libs/libcxx-${PV}[${MULTILIB_USEDEP}] ) openmp? ( >=sys-libs/libomp-${PV}[${MULTILIB_USEDEP}] )" diff --git a/sys-devel/clang-runtime/clang-runtime-9.0.0.ebuild b/sys-devel/clang-runtime/clang-runtime-9.0.0.ebuild index 53fffbc04674..ebd4556635e6 100644 --- a/sys-devel/clang-runtime/clang-runtime-9.0.0.ebuild +++ b/sys-devel/clang-runtime/clang-runtime-9.0.0.ebuild @@ -12,7 +12,7 @@ SRC_URI="" LICENSE="metapackage" SLOT="$(ver_cut 1-3)" KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="+compiler-rt crt libcxx openmp +sanitize" +IUSE="+compiler-rt libcxx openmp +sanitize" REQUIRED_USE="sanitize? ( compiler-rt )" RDEPEND=" @@ -20,11 +20,5 @@ RDEPEND=" ~sys-libs/compiler-rt-${PV}:${SLOT} sanitize? ( ~sys-libs/compiler-rt-sanitizers-${PV}:${SLOT} ) ) - crt? ( - || ( - sys-libs/netbsd-csu[${MULTILIB_USEDEP}] - sys-freebsd/freebsd-lib[${MULTILIB_USEDEP}] - ) - ) libcxx? ( >=sys-libs/libcxx-${PV}[${MULTILIB_USEDEP}] ) openmp? ( >=sys-libs/libomp-${PV}[${MULTILIB_USEDEP}] )" -- 2.26.2