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: Fri, 09 Jul 2021 14:44:52
Message-Id: 1625841869.290b36c63a66e7fb0347783e35a564baf4e03b6a.mgorny@gentoo
1 commit: 290b36c63a66e7fb0347783e35a564baf4e03b6a
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jul 9 08:43:25 2021 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Fri Jul 9 14:44:29 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=290b36c6
7
8 sys-libs/compiler-rt-sanitizers: Remove 12.0.1-rc4
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-12.0.1_rc4.ebuild | 200 ---------------------
14 2 files changed, 202 deletions(-)
15
16 diff --git a/sys-libs/compiler-rt-sanitizers/Manifest b/sys-libs/compiler-rt-sanitizers/Manifest
17 index 57af62aace3..1cad96247f6 100644
18 --- a/sys-libs/compiler-rt-sanitizers/Manifest
19 +++ b/sys-libs/compiler-rt-sanitizers/Manifest
20 @@ -1,11 +1,9 @@
21 DIST llvm-gentoo-patchset-10.0.1-4.tar.xz 10472 BLAKE2B be17f25c8e1ba102c7653ccd3890be2da18566d051dcc35eeccf738d0cdfd4c98fed1c9e3d8fada0a394acda4568d4579534255e9706912581070d3cbdb2140a SHA512 794cb77c3002b398a2fcd5f845a41f9d075ba5db53d13665c64958ec809a181ef95d054a0850e49066ef1e926e326077f4305e088ee29f30acf9c2e98161be15
22 DIST llvm-gentoo-patchset-11.1.0-3.tar.xz 5984 BLAKE2B 89056fb8e82c7a29ae76c643ac631876d51391ffb579324aaf13c7f79e03f6fd8bbcb27d46e57e0f04a702602ebf51c116e82cb092452a1dbc97fb0eb7518f11 SHA512 08aabe8836b62ecfde4e264d567169ba495d5b5915b56aba35ae86992387e534bba6d512fde94056e641abe909b478e47edcbdaa3ee0b94182ecd68c98201441
23 DIST llvm-gentoo-patchset-12.0.0-1.tar.xz 6364 BLAKE2B bcf96dad8300cdc3e1f416cb90935ae3b1359efc5687118b5a9bbee25de7087a266250f50c6f2abd18f4efeeec19354f59513c8fdd1d61c2cfc8cc2f0115e514 SHA512 76201e169f71a8d568365ffeafcfd37138e74b0536826f47eb6ce89c2280586f10426917e851f99bfb20477cd828cc40daa8cb7a62959981620fbd81e1b22ee1
24 -DIST llvm-gentoo-patchset-12.0.1-rc4-2.tar.xz 5296 BLAKE2B c01363ad0f09c397207b5f12c9143e2bd74b91d193abd0debf648edcea90750e24fcf8089ce81b54e69c8fcdce263efa78a0d1f3a096e97761acd52599cc0759 SHA512 81024c35ef1676d34525bcedb472eea322f79954f04d41a335c7eb6af93aeac43098bfeffd6d9b6963ce9eec82983fd8d0bb4eb5aa8d2714ad9552c1a707d281
25 DIST llvm-gentoo-patchset-12.0.1.tar.xz 5280 BLAKE2B 963d005bc7b636570be90eb841ac5bcaeb927538cc7de27683167111a17d6496677c7517de2ecfaf14b5d8ac22bad357be490b8a2ed9aba502fd5f447ecc99e9 SHA512 fc7c38e671555751650299c3a8bee44d5c7f26e11b68d5538c507fb7fe9ff2d349bdcd43bce90a448a747f082d523b3849d6bcda5e3ae2e998edcb926d6aa249
26 DIST llvm-gentoo-patchset-9999-1.tar.xz 4032 BLAKE2B b9413484dafed8ae0c68c2c164b45fd07bb8d5d0898f03abe118fd2120ffcb1fb6c949de9649a97c2e8105f24b9d131a725c67c0a502ca4d4d192c1a0d65f49d SHA512 e64449eeaf756c5bd945109937b84ba4bd8a015222bd792d39cf3947871e87571a4ca57814790e51544cb05ad4c2d1f044e818e4caaac7c2e2a02cb1aa290fcc
27 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
28 DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
29 DIST llvmorg-12.0.0.tar.gz 134226215 BLAKE2B f9c3ba8c58571855caa4f206fd285c9b5be66672fb0814cb8bc0964a051f57f5d35013aa1e27cbda502652b37df1ec23474129109e76a42066847860db441dbe SHA512 0cff02155c5ac0d6db2b72d60d9819d5b5dd859663b45f721b1c7540239c2fceb1f57d9173f6870c49de851c242ed8e85c5c6d6577a1f8092a7c5dcd12513b26
30 -DIST llvmorg-12.0.1-rc4.tar.gz 134278617 BLAKE2B d407421c7244bb125151e69e2a341f1af0a0cf8c1fda3b8ae3d4114c3a285d6307620bbf82b22d96d2c7782b37b0975e87be80c24e3ce1fdc71152734be1e8f8 SHA512 1a2c18435a970491eb9fc9381ba66af726e17dcbd5bf6774f9341b1e82fd35f2e5686844743f5317ebd2106b902c39e09aa98102e58a86e290b29102241c949f
31 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
32
33 diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-12.0.1_rc4.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-12.0.1_rc4.ebuild
34 deleted file mode 100644
35 index f657733b20e..00000000000
36 --- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-12.0.1_rc4.ebuild
37 +++ /dev/null
38 @@ -1,200 +0,0 @@
39 -# Copyright 1999-2021 Gentoo Authors
40 -# Distributed under the terms of the GNU General Public License v2
41 -
42 -EAPI=7
43 -
44 -PYTHON_COMPAT=( python3_{8..10} )
45 -inherit check-reqs cmake flag-o-matic llvm llvm.org python-any-r1
46 -
47 -DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)"
48 -HOMEPAGE="https://llvm.org/"
49 -
50 -LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
51 -SLOT="$(ver_cut 1-3)"
52 -KEYWORDS=""
53 -IUSE="+clang test elibc_glibc"
54 -# base targets
55 -IUSE+=" +libfuzzer +memprof +profile +xray"
56 -# sanitizer targets, keep in sync with config-ix.cmake
57 -# NB: ubsan, scudo deliberately match two entries
58 -SANITIZER_FLAGS=(
59 - asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo
60 - shadowcallstack gwp-asan
61 -)
62 -IUSE+=" ${SANITIZER_FLAGS[@]/#/+}"
63 -REQUIRED_USE="
64 - || ( ${SANITIZER_FLAGS[*]} libfuzzer profile xray )
65 - test? (
66 - cfi? ( ubsan )
67 - gwp-asan? ( scudo )
68 - )"
69 -RESTRICT="!test? ( test ) !clang? ( test )"
70 -
71 -CLANG_SLOT=${SLOT%%.*}
72 -# llvm-6 for new lit options
73 -DEPEND="
74 - >=sys-devel/llvm-6"
75 -BDEPEND="
76 - >=dev-util/cmake-3.16
77 - clang? ( sys-devel/clang )
78 - elibc_glibc? ( net-libs/libtirpc )
79 - test? (
80 - !<sys-apps/sandbox-2.13
81 - $(python_gen_any_dep ">=dev-python/lit-5[\${PYTHON_USEDEP}]")
82 - =sys-devel/clang-${PV%_*}*:${CLANG_SLOT}
83 - sys-libs/compiler-rt:${SLOT}
84 - )
85 - ${PYTHON_DEPS}"
86 -
87 -LLVM_COMPONENTS=( compiler-rt )
88 -LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )
89 -LLVM_PATCHSET=12.0.1-rc4-2
90 -llvm.org_set_globals
91 -
92 -python_check_deps() {
93 - use test || return 0
94 - has_version "dev-python/lit[${PYTHON_USEDEP}]"
95 -}
96 -
97 -check_space() {
98 - if use test; then
99 - local CHECKREQS_DISK_BUILD=11G
100 - check-reqs_pkg_pretend
101 - fi
102 -}
103 -
104 -pkg_pretend() {
105 - check_space
106 -}
107 -
108 -pkg_setup() {
109 - check_space
110 - llvm_pkg_setup
111 - python-any-r1_pkg_setup
112 -}
113 -
114 -src_prepare() {
115 - sed -i -e 's:-Werror::' lib/tsan/go/buildgo.sh || die
116 -
117 - local flag
118 - for flag in "${SANITIZER_FLAGS[@]}"; do
119 - if ! use "${flag}"; then
120 - local cmake_flag=${flag/-/_}
121 - sed -i -e "/COMPILER_RT_HAS_${cmake_flag^^}/s:TRUE:FALSE:" \
122 - cmake/config-ix.cmake || die
123 - fi
124 - done
125 -
126 - # TODO: fix these tests to be skipped upstream
127 - if use asan && ! use profile; then
128 - rm test/asan/TestCases/asan_and_llvm_coverage_test.cpp || die
129 - fi
130 - if use ubsan && ! use cfi; then
131 - > test/cfi/CMakeLists.txt || die
132 - fi
133 -
134 - llvm.org_src_prepare
135 -}
136 -
137 -src_configure() {
138 - # pre-set since we need to pass it to cmake
139 - BUILD_DIR=${WORKDIR}/compiler-rt_build
140 -
141 - if use clang; then
142 - local -x CC=${CHOST}-clang
143 - local -x CXX=${CHOST}-clang++
144 - strip-unsupported-flags
145 - fi
146 -
147 - local flag want_sanitizer=OFF
148 - for flag in "${SANITIZER_FLAGS[@]}"; do
149 - if use "${flag}"; then
150 - want_sanitizer=ON
151 - break
152 - fi
153 - done
154 -
155 - local mycmakeargs=(
156 - -DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${SLOT}"
157 - # use a build dir structure consistent with install
158 - # this makes it possible to easily deploy test-friendly clang
159 - -DCOMPILER_RT_OUTPUT_DIR="${BUILD_DIR}/lib/clang/${SLOT}"
160 -
161 - -DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
162 - # builtins & crt installed by sys-libs/compiler-rt
163 - -DCOMPILER_RT_BUILD_BUILTINS=OFF
164 - -DCOMPILER_RT_BUILD_CRT=OFF
165 - -DCOMPILER_RT_BUILD_LIBFUZZER=$(usex libfuzzer)
166 - -DCOMPILER_RT_BUILD_MEMPROF=$(usex memprof)
167 - -DCOMPILER_RT_BUILD_PROFILE=$(usex profile)
168 - -DCOMPILER_RT_BUILD_SANITIZERS="${want_sanitizer}"
169 - -DCOMPILER_RT_BUILD_XRAY=$(usex xray)
170 -
171 - -DPython3_EXECUTABLE="${PYTHON}"
172 - )
173 - if use test; then
174 - mycmakeargs+=(
175 - -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
176 - -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
177 - -DLLVM_LIT_ARGS="$(get_lit_flags)"
178 -
179 - # they are created during src_test()
180 - -DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang"
181 - -DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang++"
182 - )
183 -
184 - # same flags are passed for build & tests, so we need to strip
185 - # them down to a subset supported by clang
186 - CC=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang \
187 - CXX=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++ \
188 - strip-unsupported-flags
189 - fi
190 -
191 - if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
192 - mycmakeargs+=(
193 - # setting -isysroot is disabled with compiler-rt-prefix-paths.patch
194 - # this allows adding arm64 support using SDK in EPREFIX
195 - -DDARWIN_macosx_CACHED_SYSROOT="${EPREFIX}/MacOSX.sdk"
196 - # Set version based on the SDK in EPREFIX
197 - # This disables i386 for SDK >= 10.15
198 - # Will error if has_use tsan and SDK < 10.12
199 - -DDARWIN_macosx_OVERRIDE_SDK_VERSION="$(realpath ${EPREFIX}/MacOSX.sdk | sed -e 's/.*MacOSX\(.*\)\.sdk/\1/')"
200 - # Use our libtool instead of looking it up with xcrun
201 - -DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool"
202 - )
203 - fi
204 -
205 - cmake_src_configure
206 -
207 - if use test; then
208 - local sys_dir=( "${EPREFIX}"/usr/lib/clang/${SLOT}/lib/* )
209 - [[ -e ${sys_dir} ]] || die "Unable to find ${sys_dir}"
210 - [[ ${#sys_dir[@]} -eq 1 ]] || die "Non-deterministic compiler-rt install: ${sys_dir[*]}"
211 -
212 - # copy clang over since resource_dir is located relatively to binary
213 - # therefore, we can put our new libraries in it
214 - mkdir -p "${BUILD_DIR}"/lib/{llvm/${CLANG_SLOT}/{bin,$(get_libdir)},clang/${SLOT}/include} || die
215 - cp "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/bin/clang{,++} \
216 - "${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/bin/ || die
217 - cp "${EPREFIX}"/usr/lib/clang/${SLOT}/include/*.h \
218 - "${BUILD_DIR}"/lib/clang/${SLOT}/include/ || die
219 - cp "${sys_dir}"/*builtins*.a \
220 - "${BUILD_DIR}/lib/clang/${SLOT}/lib/${sys_dir##*/}/" || die
221 - # we also need LLVMgold.so for gold-based tests
222 - if [[ -f ${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so ]]; then
223 - ln -s "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so \
224 - "${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/$(get_libdir)/ || die
225 - fi
226 - fi
227 -}
228 -
229 -src_test() {
230 - # respect TMPDIR!
231 - local -x LIT_PRESERVES_TMP=1
232 - # disable sandbox to have it stop clobbering LD_PRELOAD
233 - local -x SANDBOX_ON=0
234 - # wipe LD_PRELOAD to make ASAN happy
235 - local -x LD_PRELOAD=
236 -
237 - cmake_build check-all
238 -}