Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

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: Thu, 10 Jun 2021 20:20:01
Message-Id: 1623356392.297becbde98426212589bfff287eb05ae8bbf40f.mgorny@gentoo
1 commit: 297becbde98426212589bfff287eb05ae8bbf40f
2 Author: Theo Anderson <telans <AT> posteo <DOT> de>
3 AuthorDate: Sat Apr 10 23:37:57 2021 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Thu Jun 10 20:19:52 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=297becbd
7
8 sys-devel/clang: support default unwindlib
9
10 Closes: https://bugs.gentoo.org/702344
11 Closes: https://bugs.gentoo.org/722978
12 Signed-off-by: Theo Anderson <telans <AT> posteo.de>
13 Closes: https://github.com/gentoo/gentoo/pull/19793
14 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
15
16 sys-devel/clang/clang-12.0.0-r1.ebuild | 9 +++++++--
17 sys-devel/clang/clang-12.0.1.9999.ebuild | 9 +++++++--
18 sys-devel/clang/clang-12.0.1_rc1.ebuild | 9 +++++++--
19 sys-devel/clang/clang-13.0.0.9999.ebuild | 9 +++++++--
20 4 files changed, 28 insertions(+), 8 deletions(-)
21
22 diff --git a/sys-devel/clang/clang-12.0.0-r1.ebuild b/sys-devel/clang/clang-12.0.0-r1.ebuild
23 index a7dae80a319..c7e07fa36cf 100644
24 --- a/sys-devel/clang/clang-12.0.0-r1.ebuild
25 +++ b/sys-devel/clang/clang-12.0.0-r1.ebuild
26 @@ -24,7 +24,7 @@ LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
27 SLOT="$(ver_cut 1)"
28 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x64-macos"
29 IUSE="debug default-compiler-rt default-libcxx default-lld
30 - doc +static-analyzer test xml kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}"
31 + doc llvm-libunwind +static-analyzer test xml kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}"
32 REQUIRED_USE="${PYTHON_REQUIRED_USE}
33 || ( ${ALL_LLVM_TARGETS[*]} )"
34 RESTRICT="!test? ( test )"
35 @@ -52,7 +52,11 @@ RDEPEND="${RDEPEND}
36 PDEPEND="
37 sys-devel/clang-common
38 ~sys-devel/clang-runtime-${PV}
39 - default-compiler-rt? ( =sys-libs/compiler-rt-${PV%_*}* )
40 + default-compiler-rt? (
41 + =sys-libs/compiler-rt-${PV%_*}*
42 + llvm-libunwind? ( sys-libs/llvm-libunwind )
43 + !llvm-libunwind? ( sys-libs/libunwind )
44 + )
45 default-libcxx? ( >=sys-libs/libcxx-${PV} )
46 default-lld? ( sys-devel/lld )"
47
48 @@ -262,6 +266,7 @@ multilib_src_configure() {
49 -DCLANG_DEFAULT_CXX_STDLIB=$(usex default-libcxx libc++ "")
50 -DCLANG_DEFAULT_RTLIB=$(usex default-compiler-rt compiler-rt "")
51 -DCLANG_DEFAULT_LINKER=$(usex default-lld lld "")
52 + -DCLANG_DEFAULT_UNWINDLIB=$(usex default-compiler-rt libunwind "")
53
54 -DCLANG_ENABLE_ARCMT=$(usex static-analyzer)
55 -DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer)
56
57 diff --git a/sys-devel/clang/clang-12.0.1.9999.ebuild b/sys-devel/clang/clang-12.0.1.9999.ebuild
58 index 74d03d6bde4..79cb7d85188 100644
59 --- a/sys-devel/clang/clang-12.0.1.9999.ebuild
60 +++ b/sys-devel/clang/clang-12.0.1.9999.ebuild
61 @@ -24,7 +24,7 @@ LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
62 SLOT="$(ver_cut 1)"
63 KEYWORDS=""
64 IUSE="debug default-compiler-rt default-libcxx default-lld
65 - doc +static-analyzer test xml kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}"
66 + doc llvm-libunwind +static-analyzer test xml kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}"
67 REQUIRED_USE="${PYTHON_REQUIRED_USE}
68 || ( ${ALL_LLVM_TARGETS[*]} )"
69 RESTRICT="!test? ( test )"
70 @@ -52,7 +52,11 @@ RDEPEND="${RDEPEND}
71 PDEPEND="
72 sys-devel/clang-common
73 ~sys-devel/clang-runtime-${PV}
74 - default-compiler-rt? ( =sys-libs/compiler-rt-${PV%_*}* )
75 + default-compiler-rt? (
76 + =sys-libs/compiler-rt-${PV%_*}*
77 + llvm-libunwind? ( sys-libs/llvm-libunwind )
78 + !llvm-libunwind? ( sys-libs/libunwind )
79 + )
80 default-libcxx? ( >=sys-libs/libcxx-${PV} )
81 default-lld? ( sys-devel/lld )"
82
83 @@ -262,6 +266,7 @@ multilib_src_configure() {
84 -DCLANG_DEFAULT_CXX_STDLIB=$(usex default-libcxx libc++ "")
85 -DCLANG_DEFAULT_RTLIB=$(usex default-compiler-rt compiler-rt "")
86 -DCLANG_DEFAULT_LINKER=$(usex default-lld lld "")
87 + -DCLANG_DEFAULT_UNWINDLIB=$(usex default-compiler-rt libunwind "")
88
89 -DCLANG_ENABLE_ARCMT=$(usex static-analyzer)
90 -DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer)
91
92 diff --git a/sys-devel/clang/clang-12.0.1_rc1.ebuild b/sys-devel/clang/clang-12.0.1_rc1.ebuild
93 index 74d03d6bde4..79cb7d85188 100644
94 --- a/sys-devel/clang/clang-12.0.1_rc1.ebuild
95 +++ b/sys-devel/clang/clang-12.0.1_rc1.ebuild
96 @@ -24,7 +24,7 @@ LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
97 SLOT="$(ver_cut 1)"
98 KEYWORDS=""
99 IUSE="debug default-compiler-rt default-libcxx default-lld
100 - doc +static-analyzer test xml kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}"
101 + doc llvm-libunwind +static-analyzer test xml kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}"
102 REQUIRED_USE="${PYTHON_REQUIRED_USE}
103 || ( ${ALL_LLVM_TARGETS[*]} )"
104 RESTRICT="!test? ( test )"
105 @@ -52,7 +52,11 @@ RDEPEND="${RDEPEND}
106 PDEPEND="
107 sys-devel/clang-common
108 ~sys-devel/clang-runtime-${PV}
109 - default-compiler-rt? ( =sys-libs/compiler-rt-${PV%_*}* )
110 + default-compiler-rt? (
111 + =sys-libs/compiler-rt-${PV%_*}*
112 + llvm-libunwind? ( sys-libs/llvm-libunwind )
113 + !llvm-libunwind? ( sys-libs/libunwind )
114 + )
115 default-libcxx? ( >=sys-libs/libcxx-${PV} )
116 default-lld? ( sys-devel/lld )"
117
118 @@ -262,6 +266,7 @@ multilib_src_configure() {
119 -DCLANG_DEFAULT_CXX_STDLIB=$(usex default-libcxx libc++ "")
120 -DCLANG_DEFAULT_RTLIB=$(usex default-compiler-rt compiler-rt "")
121 -DCLANG_DEFAULT_LINKER=$(usex default-lld lld "")
122 + -DCLANG_DEFAULT_UNWINDLIB=$(usex default-compiler-rt libunwind "")
123
124 -DCLANG_ENABLE_ARCMT=$(usex static-analyzer)
125 -DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer)
126
127 diff --git a/sys-devel/clang/clang-13.0.0.9999.ebuild b/sys-devel/clang/clang-13.0.0.9999.ebuild
128 index 94348bbca42..b8af2ee1b5e 100644
129 --- a/sys-devel/clang/clang-13.0.0.9999.ebuild
130 +++ b/sys-devel/clang/clang-13.0.0.9999.ebuild
131 @@ -24,7 +24,7 @@ LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
132 SLOT="$(ver_cut 1)"
133 KEYWORDS=""
134 IUSE="debug default-compiler-rt default-libcxx default-lld
135 - doc +static-analyzer test xml kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}"
136 + doc llvm-libunwind +static-analyzer test xml kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}"
137 REQUIRED_USE="${PYTHON_REQUIRED_USE}
138 || ( ${ALL_LLVM_TARGETS[*]} )"
139 RESTRICT="!test? ( test )"
140 @@ -52,7 +52,11 @@ RDEPEND="${RDEPEND}
141 PDEPEND="
142 sys-devel/clang-common
143 ~sys-devel/clang-runtime-${PV}
144 - default-compiler-rt? ( =sys-libs/compiler-rt-${PV%_*}* )
145 + default-compiler-rt? (
146 + =sys-libs/compiler-rt-${PV%_*}*
147 + llvm-libunwind? ( sys-libs/llvm-libunwind )
148 + !llvm-libunwind? ( sys-libs/libunwind )
149 + )
150 default-libcxx? ( >=sys-libs/libcxx-${PV} )
151 default-lld? ( sys-devel/lld )"
152
153 @@ -262,6 +266,7 @@ multilib_src_configure() {
154 -DCLANG_DEFAULT_CXX_STDLIB=$(usex default-libcxx libc++ "")
155 -DCLANG_DEFAULT_RTLIB=$(usex default-compiler-rt compiler-rt "")
156 -DCLANG_DEFAULT_LINKER=$(usex default-lld lld "")
157 + -DCLANG_DEFAULT_UNWINDLIB=$(usex default-compiler-rt libunwind "")
158
159 -DCLANG_ENABLE_ARCMT=$(usex static-analyzer)
160 -DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer)
Report Message
Find on MARC Find on Google Groups