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, 03 Aug 2022 07:02:33
Message-Id: 1659509726.9235ddd685725a4cc3d67b6a86746d3149db7128.mgorny@gentoo
1 commit: 9235ddd685725a4cc3d67b6a86746d3149db7128
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed Aug 3 06:55:02 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed Aug 3 06:55:26 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9235ddd6
7
8 sys-libs/compiler-rt-sanitizers: Remove old
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-14.0.4.ebuild | 221 ---------------------
14 2 files changed, 223 deletions(-)
15
16 diff --git a/sys-libs/compiler-rt-sanitizers/Manifest b/sys-libs/compiler-rt-sanitizers/Manifest
17 index a2cdecbccc10..3c063a38941d 100644
18 --- a/sys-libs/compiler-rt-sanitizers/Manifest
19 +++ b/sys-libs/compiler-rt-sanitizers/Manifest
20 @@ -1,8 +1,6 @@
21 DIST llvm-gentoo-patchset-13.0.1.tar.xz 6288 BLAKE2B 899222b962486e924e4f8a2b574d285531a3f87af9385ff68c81db92aa224a0cde6d4ee049b5405056bedb4b232b50e1d5840024071a4a215f6311853304c92d SHA512 b2805337f1deca626768a44c5e7ac9ed16e0c31bead1647d44a493a8123c1b8e8f1c8ceee3536bcc6fa87fdd3fcec408229f701adf30eff07e7ef9889b847b01
22 -DIST llvm-gentoo-patchset-14.0.4.tar.xz 4072 BLAKE2B cbd8804e33069ca2709503931545a57cfd33c06f28696d876d499285e9add9487a069495b756bbb94d29a162c39ece651defddd302e3ac523c5484c09fb3d2ea SHA512 db00268d01e7ec99b907321384c02468a53020386ee4fc819fabfc1cd0784323044931dac42437968d5fd37190da1b9f8f847af553a65a0595c33cecfd82c293
23 DIST llvm-gentoo-patchset-14.0.6-r2.tar.xz 16120 BLAKE2B e12e522fdb7ba505693c679cb09cc8e00e6a954df195c86c2af4dbf1b68334a405b8dcc45f2e28b5e5e0b7e9d5eb7ba907337027927371b7a3b7784ff8aae7e0 SHA512 8a5ea71c30fc0727cc855dd812bbcb6d5f51c80c98eb3d5b80258d5c5eaab1310edc9d53ae63c2ca827abec68e2912c4b69ef0da351ff883fb30545a61e1d09c
24 DIST llvm-gentoo-patchset-9999-1.tar.xz 4032 BLAKE2B b9413484dafed8ae0c68c2c164b45fd07bb8d5d0898f03abe118fd2120ffcb1fb6c949de9649a97c2e8105f24b9d131a725c67c0a502ca4d4d192c1a0d65f49d SHA512 e64449eeaf756c5bd945109937b84ba4bd8a015222bd792d39cf3947871e87571a4ca57814790e51544cb05ad4c2d1f044e818e4caaac7c2e2a02cb1aa290fcc
25 DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f15e428f22a536a17e5f4e3eb29a003b8a8ec0abe0fa3e072591161d5f30ef7d8867c1ce34d1b341ad858e93c00263499941a99 SHA512 6fc6eeb60fac698702d1aac495fc0161eb7216a1f8db2020af8fccec5837831f7cc20dc2a169bf4f0b5f520748280b4a86621f3697d622aa58faaa45dbfaad13
26 DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
27 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
28 -DIST llvmorg-14.0.4.tar.gz 158088617 BLAKE2B 7fb894548dce72593a8639b4d0220d2499577f80d38b97600749c91a498c69dfbbe818cee35e4a76370795e55da7037543ea341ad7567a6f548893c67dce9e64 SHA512 e14e6c3a1915a96e9ddc609f16ca3a398ca6f7fd0a691dadaa24490078a661340e845cb2d18f3679de4f47300bb822c33ae69548af6a0370d55737831a28b959
29
30 diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-14.0.4.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-14.0.4.ebuild
31 deleted file mode 100644
32 index c51745e85259..000000000000
33 --- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-14.0.4.ebuild
34 +++ /dev/null
35 @@ -1,221 +0,0 @@
36 -# Copyright 1999-2022 Gentoo Authors
37 -# Distributed under the terms of the GNU General Public License v2
38 -
39 -EAPI=8
40 -
41 -PYTHON_COMPAT=( python3_{8..10} )
42 -inherit check-reqs cmake flag-o-matic llvm llvm.org python-any-r1
43 -
44 -DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)"
45 -HOMEPAGE="https://llvm.org/"
46 -
47 -LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
48 -SLOT="$(ver_cut 1-3)"
49 -KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86 ~amd64-linux ~ppc-macos ~x64-macos"
50 -IUSE="+abi_x86_32 abi_x86_64 +clang debug test"
51 -# base targets
52 -IUSE+=" +libfuzzer +memprof +orc +profile +xray"
53 -# sanitizer targets, keep in sync with config-ix.cmake
54 -# NB: ubsan, scudo deliberately match two entries
55 -SANITIZER_FLAGS=(
56 - asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo
57 - shadowcallstack gwp-asan
58 -)
59 -IUSE+=" ${SANITIZER_FLAGS[@]/#/+}"
60 -REQUIRED_USE="
61 - || ( ${SANITIZER_FLAGS[*]} libfuzzer orc profile xray )
62 - test? (
63 - cfi? ( ubsan )
64 - gwp-asan? ( scudo )
65 - )
66 -"
67 -RESTRICT="
68 - !clang? ( test )
69 - !test? ( test )
70 -"
71 -
72 -CLANG_SLOT=${SLOT%%.*}
73 -# llvm-6 for new lit options
74 -DEPEND="
75 - >=sys-devel/llvm-6
76 - virtual/libcrypt[abi_x86_32(-)?,abi_x86_64(-)?]
77 -"
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 - !test? (
89 - ${PYTHON_DEPS}
90 - )
91 -"
92 -
93 -LLVM_COMPONENTS=( compiler-rt cmake )
94 -LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )
95 -LLVM_PATCHSET=${PV}
96 -llvm.org_set_globals
97 -
98 -python_check_deps() {
99 - use test || return 0
100 - has_version "dev-python/lit[${PYTHON_USEDEP}]"
101 -}
102 -
103 -check_space() {
104 - if use test; then
105 - local CHECKREQS_DISK_BUILD=11G
106 - check-reqs_pkg_pretend
107 - fi
108 -}
109 -
110 -pkg_pretend() {
111 - check_space
112 -}
113 -
114 -pkg_setup() {
115 - check_space
116 - llvm_pkg_setup
117 - python-any-r1_pkg_setup
118 -}
119 -
120 -src_prepare() {
121 - sed -i -e 's:-Werror::' lib/tsan/go/buildgo.sh || die
122 -
123 - local flag
124 - for flag in "${SANITIZER_FLAGS[@]}"; do
125 - if ! use "${flag}"; then
126 - local cmake_flag=${flag/-/_}
127 - sed -i -e "/COMPILER_RT_HAS_${cmake_flag^^}/s:TRUE:FALSE:" \
128 - cmake/config-ix.cmake || die
129 - fi
130 - done
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 - # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
145 - use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
146 -
147 - # pre-set since we need to pass it to cmake
148 - BUILD_DIR=${WORKDIR}/compiler-rt_build
149 -
150 - if use clang; then
151 - local -x CC=${CHOST}-clang
152 - local -x CXX=${CHOST}-clang++
153 - strip-unsupported-flags
154 - fi
155 -
156 - local flag want_sanitizer=OFF
157 - for flag in "${SANITIZER_FLAGS[@]}"; do
158 - if use "${flag}"; then
159 - want_sanitizer=ON
160 - break
161 - fi
162 - done
163 -
164 - local mycmakeargs=(
165 - -DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${SLOT}"
166 - # use a build dir structure consistent with install
167 - # this makes it possible to easily deploy test-friendly clang
168 - -DCOMPILER_RT_OUTPUT_DIR="${BUILD_DIR}/lib/clang/${SLOT}"
169 -
170 - -DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
171 - # builtins & crt installed by sys-libs/compiler-rt
172 - -DCOMPILER_RT_BUILD_BUILTINS=OFF
173 - -DCOMPILER_RT_BUILD_CRT=OFF
174 - -DCOMPILER_RT_BUILD_LIBFUZZER=$(usex libfuzzer)
175 - -DCOMPILER_RT_BUILD_MEMPROF=$(usex memprof)
176 - -DCOMPILER_RT_BUILD_ORC=$(usex orc)
177 - -DCOMPILER_RT_BUILD_PROFILE=$(usex profile)
178 - -DCOMPILER_RT_BUILD_SANITIZERS="${want_sanitizer}"
179 - -DCOMPILER_RT_BUILD_XRAY=$(usex xray)
180 -
181 - -DPython3_EXECUTABLE="${PYTHON}"
182 - )
183 -
184 - if use amd64; then
185 - mycmakeargs+=(
186 - -DCAN_TARGET_i386=$(usex abi_x86_32)
187 - -DCAN_TARGET_x86_64=$(usex abi_x86_64)
188 - )
189 - fi
190 -
191 - if use test; then
192 - mycmakeargs+=(
193 - -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
194 - -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
195 - -DLLVM_LIT_ARGS="$(get_lit_flags)"
196 -
197 - # they are created during src_test()
198 - -DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang"
199 - -DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang++"
200 - )
201 -
202 - # same flags are passed for build & tests, so we need to strip
203 - # them down to a subset supported by clang
204 - CC=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang \
205 - CXX=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++ \
206 - strip-unsupported-flags
207 - fi
208 -
209 - if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
210 - mycmakeargs+=(
211 - # setting -isysroot is disabled with compiler-rt-prefix-paths.patch
212 - # this allows adding arm64 support using SDK in EPREFIX
213 - -DDARWIN_macosx_CACHED_SYSROOT="${EPREFIX}/MacOSX.sdk"
214 - # Set version based on the SDK in EPREFIX
215 - # This disables i386 for SDK >= 10.15
216 - # Will error if has_use tsan and SDK < 10.12
217 - -DDARWIN_macosx_OVERRIDE_SDK_VERSION="$(realpath ${EPREFIX}/MacOSX.sdk | sed -e 's/.*MacOSX\(.*\)\.sdk/\1/')"
218 - # Use our libtool instead of looking it up with xcrun
219 - -DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool"
220 - )
221 - fi
222 -
223 - cmake_src_configure
224 -
225 - if use test; then
226 - local sys_dir=( "${EPREFIX}"/usr/lib/clang/${SLOT}/lib/* )
227 - [[ -e ${sys_dir} ]] || die "Unable to find ${sys_dir}"
228 - [[ ${#sys_dir[@]} -eq 1 ]] || die "Non-deterministic compiler-rt install: ${sys_dir[*]}"
229 -
230 - # copy clang over since resource_dir is located relatively to binary
231 - # therefore, we can put our new libraries in it
232 - mkdir -p "${BUILD_DIR}"/lib/{llvm/${CLANG_SLOT}/{bin,$(get_libdir)},clang/${SLOT}/include} || die
233 - cp "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/bin/clang{,++} \
234 - "${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/bin/ || die
235 - cp "${EPREFIX}"/usr/lib/clang/${SLOT}/include/*.h \
236 - "${BUILD_DIR}"/lib/clang/${SLOT}/include/ || die
237 - cp "${sys_dir}"/*builtins*.a \
238 - "${BUILD_DIR}/lib/clang/${SLOT}/lib/${sys_dir##*/}/" || die
239 - # we also need LLVMgold.so for gold-based tests
240 - if [[ -f ${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so ]]; then
241 - ln -s "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so \
242 - "${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/$(get_libdir)/ || die
243 - fi
244 - fi
245 -}
246 -
247 -src_test() {
248 - # respect TMPDIR!
249 - local -x LIT_PRESERVES_TMP=1
250 - # disable sandbox to have it stop clobbering LD_PRELOAD
251 - local -x SANDBOX_ON=0
252 - # wipe LD_PRELOAD to make ASAN happy
253 - local -x LD_PRELOAD=
254 -
255 - cmake_build check-all
256 -}