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