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, 02 Feb 2022 21:16:40
Message-Id: 1643836579.f433f7af0091ff54d4e99471b9c79ad22ab34f3f.mgorny@gentoo
1 commit: f433f7af0091ff54d4e99471b9c79ad22ab34f3f
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed Feb 2 16:45:03 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed Feb 2 21:16:19 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f433f7af
7
8 sys-libs/compiler-rt-sanitizers: Remove 13.0.1_rc3
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-13.0.1_rc3.ebuild | 215 ---------------------
14 2 files changed, 217 deletions(-)
15
16 diff --git a/sys-libs/compiler-rt-sanitizers/Manifest b/sys-libs/compiler-rt-sanitizers/Manifest
17 index e33e561059dd..a76de09b5b36 100644
18 --- a/sys-libs/compiler-rt-sanitizers/Manifest
19 +++ b/sys-libs/compiler-rt-sanitizers/Manifest
20 @@ -2,11 +2,9 @@ DIST llvm-gentoo-patchset-11.1.0-3.tar.xz 5984 BLAKE2B 89056fb8e82c7a29ae76c643a
21 DIST llvm-gentoo-patchset-12.0.1.tar.xz 5280 BLAKE2B 963d005bc7b636570be90eb841ac5bcaeb927538cc7de27683167111a17d6496677c7517de2ecfaf14b5d8ac22bad357be490b8a2ed9aba502fd5f447ecc99e9 SHA512 fc7c38e671555751650299c3a8bee44d5c7f26e11b68d5538c507fb7fe9ff2d349bdcd43bce90a448a747f082d523b3849d6bcda5e3ae2e998edcb926d6aa249
22 DIST llvm-gentoo-patchset-13.0.0-r3.tar.xz 10176 BLAKE2B fc5825a4bd3b85bd9c970901e5e036cc4c928373495a8a6f63c7f4531c7f52575d06f80dfbd80671d9f0fcd32d5c48d96f5961602b024c7a936362aeba8a612a SHA512 2289eef3f6301ade2e1110ebc4b66ad3db91ed10868ca7296a29c55667007e06739b01f38c0783bb2c56deadfb8a04605c370df9c5a4c6bc9aea9382e6ed52a5
23 DIST llvm-gentoo-patchset-13.0.0.tar.xz 5012 BLAKE2B 6760c78c086aaf6629143fd920b0a2c68cad9278628fbea8164dfeb59db95984a5b5d6b3505b510c697e8c95bf8d2be782c6b73c01622d52f2da9b07ecff39e0 SHA512 7764d49343b795b6bebae64f646ba27e3e6cc2a20b8a1aee645ce0d8474633c34acfbb73c08546fee415755dd4ea5a98c1d84db5e394cf5f4fc802eb61148ab6
24 -DIST llvm-gentoo-patchset-13.0.1-rc3.tar.xz 4808 BLAKE2B d8ed3ae424914437413e2e8c029880072e93d79ca79b842ad59451df46594c9b0d73ee5d49d3b65c4c7a40c86b2e0d43501ef106aea7c481f22425a5245a3411 SHA512 10430a720b120a340a681fa435a7f050741c75270607e3f5214bf829313d274c11f019f1ac072857dc5d7f868e6eb013932d1c94446e8cb2e151ac818a081914
25 DIST llvm-gentoo-patchset-13.0.1.tar.xz 6288 BLAKE2B 899222b962486e924e4f8a2b574d285531a3f87af9385ff68c81db92aa224a0cde6d4ee049b5405056bedb4b232b50e1d5840024071a4a215f6311853304c92d SHA512 b2805337f1deca626768a44c5e7ac9ed16e0c31bead1647d44a493a8123c1b8e8f1c8ceee3536bcc6fa87fdd3fcec408229f701adf30eff07e7ef9889b847b01
26 DIST llvm-gentoo-patchset-9999-1.tar.xz 4032 BLAKE2B b9413484dafed8ae0c68c2c164b45fd07bb8d5d0898f03abe118fd2120ffcb1fb6c949de9649a97c2e8105f24b9d131a725c67c0a502ca4d4d192c1a0d65f49d SHA512 e64449eeaf756c5bd945109937b84ba4bd8a015222bd792d39cf3947871e87571a4ca57814790e51544cb05ad4c2d1f044e818e4caaac7c2e2a02cb1aa290fcc
27 DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
28 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
29 DIST llvmorg-13.0.0.tar.gz 147270176 BLAKE2B 628f316b580e1edf3a58d4825b724df759e6ed2a4116802470c04562caefc392fa325c91f388036365a2e45a9595cca6d3557fab12984fc8bcfef29c9116d822 SHA512 8004c05d32b9720fb3391783621690c1df9bd1e97e72cbff9192ed88a84b0acd303b61432145fa917b5b5e548c8cee29b24ef8547dcc8677adf4816e7a8a0eb2
30 -DIST llvmorg-13.0.1-rc3.tar.gz 147302323 BLAKE2B 9ac2f97568062d7dd618295a68d6e14898fcd69e2bb66290b999ceb8c12132371f4e9b59d8ba2b252e5e5cb249045676b24fc50c117b2afae20abab98f426582 SHA512 88a04ad02af2d41ec21c7a62bad21ee0e627b7276a16795875afd062ed29ac7fb4aadec5b5e48785a6502c9fd797a4b67d648a21f193c9f7602112870b10a3d1
31 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
32
33 diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.1_rc3.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.1_rc3.ebuild
34 deleted file mode 100644
35 index 203bcf1a2488..000000000000
36 --- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.1_rc3.ebuild
37 +++ /dev/null
38 @@ -1,215 +0,0 @@
39 -# Copyright 1999-2022 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="+abi_x86_32 abi_x86_64 +clang debug test"
54 -# base targets
55 -IUSE+=" +libfuzzer +memprof +orc +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 orc 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 - virtual/libcrypt[abi_x86_32(-)?,abi_x86_64(-)?]"
76 -BDEPEND="
77 - >=dev-util/cmake-3.16
78 - clang? ( sys-devel/clang )
79 - elibc_glibc? ( net-libs/libtirpc )
80 - test? (
81 - !<sys-apps/sandbox-2.13
82 - $(python_gen_any_dep ">=dev-python/lit-5[\${PYTHON_USEDEP}]")
83 - =sys-devel/clang-${PV%_*}*:${CLANG_SLOT}
84 - sys-libs/compiler-rt:${SLOT}
85 - )
86 - !test? (
87 - ${PYTHON_DEPS}
88 - )"
89 -
90 -LLVM_COMPONENTS=( compiler-rt )
91 -LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )
92 -LLVM_PATCHSET=${PV/_/-}
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 - # TODO: fix these tests to be skipped upstream
130 - if use asan && ! use profile; then
131 - rm test/asan/TestCases/asan_and_llvm_coverage_test.cpp || die
132 - fi
133 - if use ubsan && ! use cfi; then
134 - > test/cfi/CMakeLists.txt || die
135 - fi
136 -
137 - llvm.org_src_prepare
138 -}
139 -
140 -src_configure() {
141 - # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
142 - use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
143 -
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_ORC=$(usex orc)
174 - -DCOMPILER_RT_BUILD_PROFILE=$(usex profile)
175 - -DCOMPILER_RT_BUILD_SANITIZERS="${want_sanitizer}"
176 - -DCOMPILER_RT_BUILD_XRAY=$(usex xray)
177 -
178 - -DPython3_EXECUTABLE="${PYTHON}"
179 - )
180 -
181 - if use amd64; then
182 - mycmakeargs+=(
183 - -DCAN_TARGET_i386=$(usex abi_x86_32)
184 - -DCAN_TARGET_x86_64=$(usex abi_x86_64)
185 - )
186 - fi
187 -
188 - if use test; then
189 - mycmakeargs+=(
190 - -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
191 - -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
192 - -DLLVM_LIT_ARGS="$(get_lit_flags)"
193 -
194 - # they are created during src_test()
195 - -DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang"
196 - -DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang++"
197 - )
198 -
199 - # same flags are passed for build & tests, so we need to strip
200 - # them down to a subset supported by clang
201 - CC=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang \
202 - CXX=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++ \
203 - strip-unsupported-flags
204 - fi
205 -
206 - if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
207 - mycmakeargs+=(
208 - # setting -isysroot is disabled with compiler-rt-prefix-paths.patch
209 - # this allows adding arm64 support using SDK in EPREFIX
210 - -DDARWIN_macosx_CACHED_SYSROOT="${EPREFIX}/MacOSX.sdk"
211 - # Set version based on the SDK in EPREFIX
212 - # This disables i386 for SDK >= 10.15
213 - # Will error if has_use tsan and SDK < 10.12
214 - -DDARWIN_macosx_OVERRIDE_SDK_VERSION="$(realpath ${EPREFIX}/MacOSX.sdk | sed -e 's/.*MacOSX\(.*\)\.sdk/\1/')"
215 - # Use our libtool instead of looking it up with xcrun
216 - -DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool"
217 - )
218 - fi
219 -
220 - cmake_src_configure
221 -
222 - if use test; then
223 - local sys_dir=( "${EPREFIX}"/usr/lib/clang/${SLOT}/lib/* )
224 - [[ -e ${sys_dir} ]] || die "Unable to find ${sys_dir}"
225 - [[ ${#sys_dir[@]} -eq 1 ]] || die "Non-deterministic compiler-rt install: ${sys_dir[*]}"
226 -
227 - # copy clang over since resource_dir is located relatively to binary
228 - # therefore, we can put our new libraries in it
229 - mkdir -p "${BUILD_DIR}"/lib/{llvm/${CLANG_SLOT}/{bin,$(get_libdir)},clang/${SLOT}/include} || die
230 - cp "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/bin/clang{,++} \
231 - "${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/bin/ || die
232 - cp "${EPREFIX}"/usr/lib/clang/${SLOT}/include/*.h \
233 - "${BUILD_DIR}"/lib/clang/${SLOT}/include/ || die
234 - cp "${sys_dir}"/*builtins*.a \
235 - "${BUILD_DIR}/lib/clang/${SLOT}/lib/${sys_dir##*/}/" || die
236 - # we also need LLVMgold.so for gold-based tests
237 - if [[ -f ${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so ]]; then
238 - ln -s "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so \
239 - "${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/$(get_libdir)/ || die
240 - fi
241 - fi
242 -}
243 -
244 -src_test() {
245 - # respect TMPDIR!
246 - local -x LIT_PRESERVES_TMP=1
247 - # disable sandbox to have it stop clobbering LD_PRELOAD
248 - local -x SANDBOX_ON=0
249 - # wipe LD_PRELOAD to make ASAN happy
250 - local -x LD_PRELOAD=
251 -
252 - cmake_build check-all
253 -}