Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/clang/
Date: Fri, 30 Sep 2022 14:52:30
Message-Id: 1664549537.28907fb65bfbb1e76da28a18339abdd07e4b53a6.mgorny@gentoo
1 commit: 28907fb65bfbb1e76da28a18339abdd07e4b53a6
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Fri Sep 30 13:14:39 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Fri Sep 30 14:52:17 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28907fb6
7
8 sys-devel/clang: Remove obsolete default-* flags in 16.x
9
10 Now that the defaults are controlled via the configuration file,
11 remove the relevant flags from the sys-devel/clang ebuilds.
12
13 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
14
15 sys-devel/clang/clang-16.0.0.9999.ebuild | 17 +----------------
16 sys-devel/clang/clang-16.0.0_pre20220930.ebuild | 17 +----------------
17 2 files changed, 2 insertions(+), 32 deletions(-)
18
19 diff --git a/sys-devel/clang/clang-16.0.0.9999.ebuild b/sys-devel/clang/clang-16.0.0.9999.ebuild
20 index 1bf259b60f4b..d8c93d2e1d27 100644
21 --- a/sys-devel/clang/clang-16.0.0.9999.ebuild
22 +++ b/sys-devel/clang/clang-16.0.0.9999.ebuild
23 @@ -16,10 +16,7 @@ HOMEPAGE="https://llvm.org/"
24 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
25 SLOT="$(ver_cut 1)"
26 KEYWORDS=""
27 -IUSE="
28 - debug default-compiler-rt default-libcxx default-lld doc
29 - llvm-libunwind +pie +static-analyzer test xml
30 -"
31 +IUSE="debug doc +pie +static-analyzer test xml"
32 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
33 RESTRICT="!test? ( test )"
34
35 @@ -47,13 +44,6 @@ PDEPEND="
36 sys-devel/clang-common
37 sys-devel/clang-toolchain-symlinks:${SLOT}
38 ~sys-devel/clang-runtime-${PV}
39 - default-compiler-rt? (
40 - =sys-libs/compiler-rt-${PV%_*}*
41 - llvm-libunwind? ( sys-libs/llvm-libunwind )
42 - !llvm-libunwind? ( sys-libs/libunwind )
43 - )
44 - default-libcxx? ( >=sys-libs/libcxx-${PV} )
45 - default-lld? ( sys-devel/lld )
46 "
47
48 LLVM_COMPONENTS=(
49 @@ -284,12 +274,7 @@ multilib_src_configure() {
50 # disable using CUDA to autodetect GPU, just build for all
51 -DCMAKE_DISABLE_FIND_PACKAGE_CUDA=ON
52
53 - # override default stdlib and rtlib
54 - -DCLANG_DEFAULT_CXX_STDLIB=$(usex default-libcxx libc++ "")
55 - -DCLANG_DEFAULT_RTLIB=$(usex default-compiler-rt compiler-rt "")
56 - -DCLANG_DEFAULT_LINKER=$(usex default-lld lld "")
57 -DCLANG_DEFAULT_PIE_ON_LINUX=$(usex pie)
58 - -DCLANG_DEFAULT_UNWINDLIB=$(usex default-compiler-rt libunwind "")
59
60 -DCLANG_ENABLE_ARCMT=$(usex static-analyzer)
61 -DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer)
62
63 diff --git a/sys-devel/clang/clang-16.0.0_pre20220930.ebuild b/sys-devel/clang/clang-16.0.0_pre20220930.ebuild
64 index 1bf259b60f4b..d8c93d2e1d27 100644
65 --- a/sys-devel/clang/clang-16.0.0_pre20220930.ebuild
66 +++ b/sys-devel/clang/clang-16.0.0_pre20220930.ebuild
67 @@ -16,10 +16,7 @@ HOMEPAGE="https://llvm.org/"
68 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
69 SLOT="$(ver_cut 1)"
70 KEYWORDS=""
71 -IUSE="
72 - debug default-compiler-rt default-libcxx default-lld doc
73 - llvm-libunwind +pie +static-analyzer test xml
74 -"
75 +IUSE="debug doc +pie +static-analyzer test xml"
76 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
77 RESTRICT="!test? ( test )"
78
79 @@ -47,13 +44,6 @@ PDEPEND="
80 sys-devel/clang-common
81 sys-devel/clang-toolchain-symlinks:${SLOT}
82 ~sys-devel/clang-runtime-${PV}
83 - default-compiler-rt? (
84 - =sys-libs/compiler-rt-${PV%_*}*
85 - llvm-libunwind? ( sys-libs/llvm-libunwind )
86 - !llvm-libunwind? ( sys-libs/libunwind )
87 - )
88 - default-libcxx? ( >=sys-libs/libcxx-${PV} )
89 - default-lld? ( sys-devel/lld )
90 "
91
92 LLVM_COMPONENTS=(
93 @@ -284,12 +274,7 @@ multilib_src_configure() {
94 # disable using CUDA to autodetect GPU, just build for all
95 -DCMAKE_DISABLE_FIND_PACKAGE_CUDA=ON
96
97 - # override default stdlib and rtlib
98 - -DCLANG_DEFAULT_CXX_STDLIB=$(usex default-libcxx libc++ "")
99 - -DCLANG_DEFAULT_RTLIB=$(usex default-compiler-rt compiler-rt "")
100 - -DCLANG_DEFAULT_LINKER=$(usex default-lld lld "")
101 -DCLANG_DEFAULT_PIE_ON_LINUX=$(usex pie)
102 - -DCLANG_DEFAULT_UNWINDLIB=$(usex default-compiler-rt libunwind "")
103
104 -DCLANG_ENABLE_ARCMT=$(usex static-analyzer)
105 -DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer)