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