From 297becbde98426212589bfff287eb05ae8bbf40f Mon Sep 17 00:00:00 2001 From: Theo Anderson Date: Sun, 11 Apr 2021 11:37:57 +1200 Subject: sys-devel/clang: support default unwindlib MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes: https://bugs.gentoo.org/702344 Closes: https://bugs.gentoo.org/722978 Signed-off-by: Theo Anderson Closes: https://github.com/gentoo/gentoo/pull/19793 Signed-off-by: Michał Górny --- sys-devel/clang/clang-12.0.0-r1.ebuild | 9 +++++++-- sys-devel/clang/clang-12.0.1.9999.ebuild | 9 +++++++-- sys-devel/clang/clang-12.0.1_rc1.ebuild | 9 +++++++-- sys-devel/clang/clang-13.0.0.9999.ebuild | 9 +++++++-- 4 files changed, 28 insertions(+), 8 deletions(-) diff --git a/sys-devel/clang/clang-12.0.0-r1.ebuild b/sys-devel/clang/clang-12.0.0-r1.ebuild index a7dae80a319a..c7e07fa36cf5 100644 --- a/sys-devel/clang/clang-12.0.0-r1.ebuild +++ b/sys-devel/clang/clang-12.0.0-r1.ebuild @@ -24,7 +24,7 @@ LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT" SLOT="$(ver_cut 1)" KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x64-macos" IUSE="debug default-compiler-rt default-libcxx default-lld - doc +static-analyzer test xml kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}" + doc llvm-libunwind +static-analyzer test xml kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}" REQUIRED_USE="${PYTHON_REQUIRED_USE} || ( ${ALL_LLVM_TARGETS[*]} )" RESTRICT="!test? ( test )" @@ -52,7 +52,11 @@ RDEPEND="${RDEPEND} PDEPEND=" sys-devel/clang-common ~sys-devel/clang-runtime-${PV} - default-compiler-rt? ( =sys-libs/compiler-rt-${PV%_*}* ) + default-compiler-rt? ( + =sys-libs/compiler-rt-${PV%_*}* + llvm-libunwind? ( sys-libs/llvm-libunwind ) + !llvm-libunwind? ( sys-libs/libunwind ) + ) default-libcxx? ( >=sys-libs/libcxx-${PV} ) default-lld? ( sys-devel/lld )" @@ -262,6 +266,7 @@ multilib_src_configure() { -DCLANG_DEFAULT_CXX_STDLIB=$(usex default-libcxx libc++ "") -DCLANG_DEFAULT_RTLIB=$(usex default-compiler-rt compiler-rt "") -DCLANG_DEFAULT_LINKER=$(usex default-lld lld "") + -DCLANG_DEFAULT_UNWINDLIB=$(usex default-compiler-rt libunwind "") -DCLANG_ENABLE_ARCMT=$(usex static-analyzer) -DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer) diff --git a/sys-devel/clang/clang-12.0.1.9999.ebuild b/sys-devel/clang/clang-12.0.1.9999.ebuild index 74d03d6bde4f..79cb7d851883 100644 --- a/sys-devel/clang/clang-12.0.1.9999.ebuild +++ b/sys-devel/clang/clang-12.0.1.9999.ebuild @@ -24,7 +24,7 @@ LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT" SLOT="$(ver_cut 1)" KEYWORDS="" IUSE="debug default-compiler-rt default-libcxx default-lld - doc +static-analyzer test xml kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}" + doc llvm-libunwind +static-analyzer test xml kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}" REQUIRED_USE="${PYTHON_REQUIRED_USE} || ( ${ALL_LLVM_TARGETS[*]} )" RESTRICT="!test? ( test )" @@ -52,7 +52,11 @@ RDEPEND="${RDEPEND} PDEPEND=" sys-devel/clang-common ~sys-devel/clang-runtime-${PV} - default-compiler-rt? ( =sys-libs/compiler-rt-${PV%_*}* ) + default-compiler-rt? ( + =sys-libs/compiler-rt-${PV%_*}* + llvm-libunwind? ( sys-libs/llvm-libunwind ) + !llvm-libunwind? ( sys-libs/libunwind ) + ) default-libcxx? ( >=sys-libs/libcxx-${PV} ) default-lld? ( sys-devel/lld )" @@ -262,6 +266,7 @@ multilib_src_configure() { -DCLANG_DEFAULT_CXX_STDLIB=$(usex default-libcxx libc++ "") -DCLANG_DEFAULT_RTLIB=$(usex default-compiler-rt compiler-rt "") -DCLANG_DEFAULT_LINKER=$(usex default-lld lld "") + -DCLANG_DEFAULT_UNWINDLIB=$(usex default-compiler-rt libunwind "") -DCLANG_ENABLE_ARCMT=$(usex static-analyzer) -DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer) diff --git a/sys-devel/clang/clang-12.0.1_rc1.ebuild b/sys-devel/clang/clang-12.0.1_rc1.ebuild index 74d03d6bde4f..79cb7d851883 100644 --- a/sys-devel/clang/clang-12.0.1_rc1.ebuild +++ b/sys-devel/clang/clang-12.0.1_rc1.ebuild @@ -24,7 +24,7 @@ LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT" SLOT="$(ver_cut 1)" KEYWORDS="" IUSE="debug default-compiler-rt default-libcxx default-lld - doc +static-analyzer test xml kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}" + doc llvm-libunwind +static-analyzer test xml kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}" REQUIRED_USE="${PYTHON_REQUIRED_USE} || ( ${ALL_LLVM_TARGETS[*]} )" RESTRICT="!test? ( test )" @@ -52,7 +52,11 @@ RDEPEND="${RDEPEND} PDEPEND=" sys-devel/clang-common ~sys-devel/clang-runtime-${PV} - default-compiler-rt? ( =sys-libs/compiler-rt-${PV%_*}* ) + default-compiler-rt? ( + =sys-libs/compiler-rt-${PV%_*}* + llvm-libunwind? ( sys-libs/llvm-libunwind ) + !llvm-libunwind? ( sys-libs/libunwind ) + ) default-libcxx? ( >=sys-libs/libcxx-${PV} ) default-lld? ( sys-devel/lld )" @@ -262,6 +266,7 @@ multilib_src_configure() { -DCLANG_DEFAULT_CXX_STDLIB=$(usex default-libcxx libc++ "") -DCLANG_DEFAULT_RTLIB=$(usex default-compiler-rt compiler-rt "") -DCLANG_DEFAULT_LINKER=$(usex default-lld lld "") + -DCLANG_DEFAULT_UNWINDLIB=$(usex default-compiler-rt libunwind "") -DCLANG_ENABLE_ARCMT=$(usex static-analyzer) -DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer) diff --git a/sys-devel/clang/clang-13.0.0.9999.ebuild b/sys-devel/clang/clang-13.0.0.9999.ebuild index 94348bbca42d..b8af2ee1b5e6 100644 --- a/sys-devel/clang/clang-13.0.0.9999.ebuild +++ b/sys-devel/clang/clang-13.0.0.9999.ebuild @@ -24,7 +24,7 @@ LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT" SLOT="$(ver_cut 1)" KEYWORDS="" IUSE="debug default-compiler-rt default-libcxx default-lld - doc +static-analyzer test xml kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}" + doc llvm-libunwind +static-analyzer test xml kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}" REQUIRED_USE="${PYTHON_REQUIRED_USE} || ( ${ALL_LLVM_TARGETS[*]} )" RESTRICT="!test? ( test )" @@ -52,7 +52,11 @@ RDEPEND="${RDEPEND} PDEPEND=" sys-devel/clang-common ~sys-devel/clang-runtime-${PV} - default-compiler-rt? ( =sys-libs/compiler-rt-${PV%_*}* ) + default-compiler-rt? ( + =sys-libs/compiler-rt-${PV%_*}* + llvm-libunwind? ( sys-libs/llvm-libunwind ) + !llvm-libunwind? ( sys-libs/libunwind ) + ) default-libcxx? ( >=sys-libs/libcxx-${PV} ) default-lld? ( sys-devel/lld )" @@ -262,6 +266,7 @@ multilib_src_configure() { -DCLANG_DEFAULT_CXX_STDLIB=$(usex default-libcxx libc++ "") -DCLANG_DEFAULT_RTLIB=$(usex default-compiler-rt compiler-rt "") -DCLANG_DEFAULT_LINKER=$(usex default-lld lld "") + -DCLANG_DEFAULT_UNWINDLIB=$(usex default-compiler-rt libunwind "") -DCLANG_ENABLE_ARCMT=$(usex static-analyzer) -DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer) -- cgit v1.2.3-65-gdbad