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-libs/compiler-rt-sanitizers/
Date: Wed, 04 Mar 2020 18:39:20
Message-Id: 1583347138.b60b9a9afe109bcd9910871810b79c394ac62a16.mgorny@gentoo
1 commit: b60b9a9afe109bcd9910871810b79c394ac62a16
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed Mar 4 18:12:47 2020 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed Mar 4 18:38:58 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b60b9a9a
7
8 sys-libs/compiler-rt-sanitizers: Remove 10.0.0rc[12]
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 sys-libs/compiler-rt-sanitizers/Manifest | 2 -
13 .../compiler-rt-sanitizers-10.0.0_rc1.ebuild | 158 ---------------------
14 .../compiler-rt-sanitizers-10.0.0_rc2.ebuild | 146 -------------------
15 3 files changed, 306 deletions(-)
16
17 diff --git a/sys-libs/compiler-rt-sanitizers/Manifest b/sys-libs/compiler-rt-sanitizers/Manifest
18 index 53d669bd687..7f8b7719797 100644
19 --- a/sys-libs/compiler-rt-sanitizers/Manifest
20 +++ b/sys-libs/compiler-rt-sanitizers/Manifest
21 @@ -2,7 +2,5 @@ DIST compiler-rt-7.1.0.src.tar.xz 1864248 BLAKE2B 42ab86416f7f85c5833cf85dbfb66b
22 DIST compiler-rt-8.0.1.src.tar.xz 1954204 BLAKE2B cbba1d5fb37385116920da39dea26739d09e3f11c392503f8bc45293f1ef00c97f6a9fbd3ba67094d7f1e532410d0eca461943dadfdb10646110470a8e3b5f1f SHA512 12bf1bdabe25c0c3a84cc73a718fe154573dd729ec3ff5e099bd5f74c6bec9c80521b87ded646d3b20dfdb9aa51dea0234281418c7eb81805e1dd5d3107d3d8e
23 DIST llvm-7.1.0.src.tar.xz 28313784 BLAKE2B b78d9a7fc5ef6e352e77d339e5c4eef5ccedf67c05e7abd949e72619aa8a5ed65e7e5e2008354be8e7916d75581719b99f34227838fcc86c5d0080913c2fb22c SHA512 a7dbd5693d1f2dae6b6e52893a100f9349cbfcfb25c5fdcad46364acbff0dbd3573f8fbc026c68eb9fd56335198aa94b866cc3dd7ea0cbd2cbfb5f8fe3444a7a
24 DIST llvm-8.0.1.src.tar.xz 30477608 BLAKE2B 4319c837b36111401e3b0f9659b8d875c89463bcc7816df1aefe1e3ff989860bbaa92504718f8e15416cfd9f3491c13777cd5cb661877b237b342b0e515b93f5 SHA512 82e120be5cabdfd5111aebbea68a663fe229c8861d73802d6ab09a3bf48f60de333e07e61f8fb61beaa14ac2bea24fcd74fa6f761acaf62469f536b79fcb1e16
25 -DIST llvmorg-10.0.0-rc1.tar.gz 120755822 BLAKE2B a729d37d96ba498cb865c6f708734dccb796b2caabb69167b9aa3b0e12c788f2a5980a048b99d5603da3d26af909fb31f406b4f4743cabae56c45f829a7bf695 SHA512 27137fc700971147c00ded6787eaae9f0bcf98c938fe227a5a559b38d983736f3d086f4ff6772d802c5f48a7d97a97c293261e4af88fcb5a720693b9cb5a4f02
26 -DIST llvmorg-10.0.0-rc2.tar.gz 120795019 BLAKE2B 6e701eddbd2313e777c7b37dff8455a08d3c599d01055b60afc0319373d4709deb429aac6bf9e80c4d2e2ab8ade03bf5b398b6ccd8882e4bde608d10cdbf2284 SHA512 ee571c9258a2d9fc411964f56b0b92b2e7134349ed21dbe7963eb61ef65da506e0c4f7c69259a3b6cecec23f55d24636608287ee4457ee667031e141f8f09aae
27 DIST llvmorg-10.0.0-rc3.tar.gz 120814170 BLAKE2B 432fe0c1e74d3020a269a256e6e456cbfa0b7166dd3f86df6caf3a55e1931c022285fe8afdc4d8998c729c5471acf5308abb336782ddec2ef9b0f58d1ccb5a3c SHA512 aad1df86063612d20c48ea7046940330fe2ac572a146be22ff71d9e65fa3438184cb39a2533fc6afd1e74df26909a9f0d24ebcd7d62e74728cfd81e447f2ffbf
28 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
29
30 diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.0_rc1.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.0_rc1.ebuild
31 deleted file mode 100644
32 index dfbc385859a..00000000000
33 --- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.0_rc1.ebuild
34 +++ /dev/null
35 @@ -1,158 +0,0 @@
36 -# Copyright 1999-2020 Gentoo Authors
37 -# Distributed under the terms of the GNU General Public License v2
38 -
39 -EAPI=7
40 -
41 -PYTHON_COMPAT=( python3_{6,7} )
42 -inherit check-reqs cmake-utils flag-o-matic llvm llvm.org \
43 - multiprocessing python-any-r1
44 -
45 -DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)"
46 -HOMEPAGE="https://llvm.org/"
47 -LLVM_COMPONENTS=( compiler-rt )
48 -LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )
49 -llvm.org_set_globals
50 -
51 -LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
52 -SLOT="$(ver_cut 1-3)"
53 -KEYWORDS=""
54 -IUSE="+clang +libfuzzer +profile +sanitize test +xray elibc_glibc"
55 -# FIXME: libfuzzer does not enable all its necessary dependencies
56 -REQUIRED_USE="libfuzzer? ( || ( sanitize xray ) )"
57 -RESTRICT="!test? ( test ) !clang? ( test )"
58 -
59 -CLANG_SLOT=${SLOT%%.*}
60 -# llvm-6 for new lit options
61 -DEPEND="
62 - >=sys-devel/llvm-6"
63 -BDEPEND="
64 - clang? ( sys-devel/clang )
65 - elibc_glibc? ( net-libs/libtirpc )
66 - test? (
67 - !<sys-apps/sandbox-2.13
68 - $(python_gen_any_dep ">=dev-python/lit-5[\${PYTHON_USEDEP}]")
69 - =sys-devel/clang-${PV%_*}*:${CLANG_SLOT}
70 - sys-libs/compiler-rt:${SLOT} )
71 - ${PYTHON_DEPS}"
72 -
73 -# least intrusive of all
74 -CMAKE_BUILD_TYPE=RelWithDebInfo
75 -
76 -python_check_deps() {
77 - use test || return 0
78 - has_version "dev-python/lit[${PYTHON_USEDEP}]"
79 -}
80 -
81 -check_space() {
82 - if use test; then
83 - local CHECKREQS_DISK_BUILD=11G
84 - check-reqs_pkg_pretend
85 - fi
86 -}
87 -
88 -pkg_pretend() {
89 - check_space
90 -}
91 -
92 -pkg_setup() {
93 - check_space
94 - llvm_pkg_setup
95 - python-any-r1_pkg_setup
96 -}
97 -
98 -src_prepare() {
99 - cmake-utils_src_prepare
100 -
101 - if use test; then
102 - # remove tests that are (still) broken by new glibc
103 - # https://bugs.llvm.org/show_bug.cgi?id=36065
104 - if use elibc_glibc && has_version '>=sys-libs/glibc-2.25'; then
105 - rm test/lsan/TestCases/Linux/fork_and_leak.cpp || die
106 - fi
107 - fi
108 -}
109 -
110 -src_configure() {
111 - # pre-set since we need to pass it to cmake
112 - BUILD_DIR=${WORKDIR}/compiler-rt_build
113 -
114 - if use clang; then
115 - local -x CC=${CHOST}-clang
116 - local -x CXX=${CHOST}-clang++
117 - strip-unsupported-flags
118 - fi
119 -
120 - local mycmakeargs=(
121 - -DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${SLOT}"
122 - # use a build dir structure consistent with install
123 - # this makes it possible to easily deploy test-friendly clang
124 - -DCOMPILER_RT_OUTPUT_DIR="${BUILD_DIR}/lib/clang/${SLOT}"
125 -
126 - -DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
127 - # builtins & crt installed by sys-libs/compiler-rt
128 - -DCOMPILER_RT_BUILD_BUILTINS=OFF
129 - -DCOMPILER_RT_BUILD_CRT=OFF
130 - -DCOMPILER_RT_BUILD_LIBFUZZER=$(usex libfuzzer)
131 - -DCOMPILER_RT_BUILD_PROFILE=$(usex profile)
132 - -DCOMPILER_RT_BUILD_SANITIZERS=$(usex sanitize)
133 - -DCOMPILER_RT_BUILD_XRAY=$(usex xray)
134 - )
135 - if use test; then
136 - mycmakeargs+=(
137 - -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
138 - -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
139 - -DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
140 -
141 - # they are created during src_test()
142 - -DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang"
143 - -DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang++"
144 - )
145 -
146 - # same flags are passed for build & tests, so we need to strip
147 - # them down to a subset supported by clang
148 - CC=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang \
149 - CXX=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++ \
150 - strip-unsupported-flags
151 - fi
152 -
153 - if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
154 - mycmakeargs+=(
155 - # disable use of SDK for the system itself
156 - -DDARWIN_macosx_CACHED_SYSROOT=/
157 - )
158 - fi
159 -
160 - cmake-utils_src_configure
161 -
162 - if use test; then
163 - local sys_dir=( "${EPREFIX}"/usr/lib/clang/${SLOT}/lib/* )
164 - [[ -e ${sys_dir} ]] || die "Unable to find ${sys_dir}"
165 - [[ ${#sys_dir[@]} -eq 1 ]] || die "Non-deterministic compiler-rt install: ${sys_dir[*]}"
166 -
167 - # copy clang over since resource_dir is located relatively to binary
168 - # therefore, we can put our new libraries in it
169 - mkdir -p "${BUILD_DIR}"/lib/{llvm/${CLANG_SLOT}/{bin,$(get_libdir)},clang/${SLOT}/include} || die
170 - cp "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/bin/clang{,++} \
171 - "${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/bin/ || die
172 - cp "${EPREFIX}"/usr/lib/clang/${SLOT}/include/*.h \
173 - "${BUILD_DIR}"/lib/clang/${SLOT}/include/ || die
174 - cp "${sys_dir}"/*builtins*.a \
175 - "${BUILD_DIR}/lib/clang/${SLOT}/lib/${sys_dir##*/}/" || die
176 - # we also need LLVMgold.so for gold-based tests
177 - if [[ -f ${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so ]]; then
178 - ln -s "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so \
179 - "${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/$(get_libdir)/ || die
180 - fi
181 - fi
182 -}
183 -
184 -src_test() {
185 - # respect TMPDIR!
186 - local -x LIT_PRESERVES_TMP=1
187 - # disable sandbox to have it stop clobbering LD_PRELOAD
188 - local -x SANDBOX_ON=0
189 - # wipe LD_PRELOAD to make ASAN happy
190 - local -x LD_PRELOAD=
191 -
192 - cmake-utils_src_make check-all
193 -}
194
195 diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.0_rc2.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.0_rc2.ebuild
196 deleted file mode 100644
197 index 593a9a3363c..00000000000
198 --- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.0_rc2.ebuild
199 +++ /dev/null
200 @@ -1,146 +0,0 @@
201 -# Copyright 1999-2020 Gentoo Authors
202 -# Distributed under the terms of the GNU General Public License v2
203 -
204 -EAPI=7
205 -
206 -PYTHON_COMPAT=( python3_{6,7,8} )
207 -inherit check-reqs cmake-utils flag-o-matic llvm llvm.org \
208 - multiprocessing python-any-r1
209 -
210 -DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)"
211 -HOMEPAGE="https://llvm.org/"
212 -LLVM_COMPONENTS=( compiler-rt )
213 -LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )
214 -llvm.org_set_globals
215 -
216 -LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
217 -SLOT="$(ver_cut 1-3)"
218 -KEYWORDS=""
219 -IUSE="+clang +libfuzzer +profile +sanitize test +xray elibc_glibc"
220 -# FIXME: libfuzzer does not enable all its necessary dependencies
221 -REQUIRED_USE="libfuzzer? ( || ( sanitize xray ) )"
222 -RESTRICT="!test? ( test ) !clang? ( test )"
223 -
224 -CLANG_SLOT=${SLOT%%.*}
225 -# llvm-6 for new lit options
226 -DEPEND="
227 - >=sys-devel/llvm-6"
228 -BDEPEND="
229 - clang? ( sys-devel/clang )
230 - elibc_glibc? ( net-libs/libtirpc )
231 - test? (
232 - !<sys-apps/sandbox-2.13
233 - $(python_gen_any_dep ">=dev-python/lit-5[\${PYTHON_USEDEP}]")
234 - =sys-devel/clang-${PV%_*}*:${CLANG_SLOT}
235 - sys-libs/compiler-rt:${SLOT} )
236 - ${PYTHON_DEPS}"
237 -
238 -# least intrusive of all
239 -CMAKE_BUILD_TYPE=RelWithDebInfo
240 -
241 -python_check_deps() {
242 - use test || return 0
243 - has_version "dev-python/lit[${PYTHON_USEDEP}]"
244 -}
245 -
246 -check_space() {
247 - if use test; then
248 - local CHECKREQS_DISK_BUILD=11G
249 - check-reqs_pkg_pretend
250 - fi
251 -}
252 -
253 -pkg_pretend() {
254 - check_space
255 -}
256 -
257 -pkg_setup() {
258 - check_space
259 - llvm_pkg_setup
260 - python-any-r1_pkg_setup
261 -}
262 -
263 -src_configure() {
264 - # pre-set since we need to pass it to cmake
265 - BUILD_DIR=${WORKDIR}/compiler-rt_build
266 -
267 - if use clang; then
268 - local -x CC=${CHOST}-clang
269 - local -x CXX=${CHOST}-clang++
270 - strip-unsupported-flags
271 - fi
272 -
273 - local mycmakeargs=(
274 - -DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${SLOT}"
275 - # use a build dir structure consistent with install
276 - # this makes it possible to easily deploy test-friendly clang
277 - -DCOMPILER_RT_OUTPUT_DIR="${BUILD_DIR}/lib/clang/${SLOT}"
278 -
279 - -DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
280 - # builtins & crt installed by sys-libs/compiler-rt
281 - -DCOMPILER_RT_BUILD_BUILTINS=OFF
282 - -DCOMPILER_RT_BUILD_CRT=OFF
283 - -DCOMPILER_RT_BUILD_LIBFUZZER=$(usex libfuzzer)
284 - -DCOMPILER_RT_BUILD_PROFILE=$(usex profile)
285 - -DCOMPILER_RT_BUILD_SANITIZERS=$(usex sanitize)
286 - -DCOMPILER_RT_BUILD_XRAY=$(usex xray)
287 - )
288 - if use test; then
289 - mycmakeargs+=(
290 - -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
291 - -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
292 - -DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
293 -
294 - # they are created during src_test()
295 - -DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang"
296 - -DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang++"
297 - )
298 -
299 - # same flags are passed for build & tests, so we need to strip
300 - # them down to a subset supported by clang
301 - CC=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang \
302 - CXX=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++ \
303 - strip-unsupported-flags
304 - fi
305 -
306 - if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
307 - mycmakeargs+=(
308 - # disable use of SDK for the system itself
309 - -DDARWIN_macosx_CACHED_SYSROOT=/
310 - )
311 - fi
312 -
313 - cmake-utils_src_configure
314 -
315 - if use test; then
316 - local sys_dir=( "${EPREFIX}"/usr/lib/clang/${SLOT}/lib/* )
317 - [[ -e ${sys_dir} ]] || die "Unable to find ${sys_dir}"
318 - [[ ${#sys_dir[@]} -eq 1 ]] || die "Non-deterministic compiler-rt install: ${sys_dir[*]}"
319 -
320 - # copy clang over since resource_dir is located relatively to binary
321 - # therefore, we can put our new libraries in it
322 - mkdir -p "${BUILD_DIR}"/lib/{llvm/${CLANG_SLOT}/{bin,$(get_libdir)},clang/${SLOT}/include} || die
323 - cp "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/bin/clang{,++} \
324 - "${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/bin/ || die
325 - cp "${EPREFIX}"/usr/lib/clang/${SLOT}/include/*.h \
326 - "${BUILD_DIR}"/lib/clang/${SLOT}/include/ || die
327 - cp "${sys_dir}"/*builtins*.a \
328 - "${BUILD_DIR}/lib/clang/${SLOT}/lib/${sys_dir##*/}/" || die
329 - # we also need LLVMgold.so for gold-based tests
330 - if [[ -f ${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so ]]; then
331 - ln -s "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so \
332 - "${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/$(get_libdir)/ || die
333 - fi
334 - fi
335 -}
336 -
337 -src_test() {
338 - # respect TMPDIR!
339 - local -x LIT_PRESERVES_TMP=1
340 - # disable sandbox to have it stop clobbering LD_PRELOAD
341 - local -x SANDBOX_ON=0
342 - # wipe LD_PRELOAD to make ASAN happy
343 - local -x LD_PRELOAD=
344 -
345 - cmake-utils_src_make check-all
346 -}