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, 25 Jun 2022 13:08:25
Message-Id: 1656162448.7adb5a866a6afd018f3aafa648826e48f6f42e0e.mgorny@gentoo
1 commit: 7adb5a866a6afd018f3aafa648826e48f6f42e0e
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jun 25 11:19:22 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sat Jun 25 13:07:28 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7adb5a86
7
8 sys-libs/compiler-rt-sanitizers: Bump to 14.0.6
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 sys-libs/compiler-rt-sanitizers/Manifest | 3 +
13 .../compiler-rt-sanitizers-14.0.6.ebuild | 221 +++++++++++++++++++++
14 2 files changed, 224 insertions(+)
15
16 diff --git a/sys-libs/compiler-rt-sanitizers/Manifest b/sys-libs/compiler-rt-sanitizers/Manifest
17 index 6281aaebc7d4..9688cf1bc0bb 100644
18 --- a/sys-libs/compiler-rt-sanitizers/Manifest
19 +++ b/sys-libs/compiler-rt-sanitizers/Manifest
20 @@ -4,9 +4,12 @@ DIST llvm-gentoo-patchset-14.0.1.tar.xz 4724 BLAKE2B 2689298c687fa8b5fa2545afccc
21 DIST llvm-gentoo-patchset-14.0.3.tar.xz 5492 BLAKE2B 48a46d50a81c5572d1573c6923bc404b198f74ee8587a928e0858553dac37f7fa39cc969d72b938ef3d2f04f6872f9e2e2478821ab90c657ecbbacb3f7d99d7a SHA512 b917b549de6d46cd7aab3e59b888b5e5ffb955435b33d6538be2f31dc30217a24740a673cb6bb661087c245121edb079052b179badaf70b86b985ca69b3652a6
22 DIST llvm-gentoo-patchset-14.0.4.tar.xz 4072 BLAKE2B cbd8804e33069ca2709503931545a57cfd33c06f28696d876d499285e9add9487a069495b756bbb94d29a162c39ece651defddd302e3ac523c5484c09fb3d2ea SHA512 db00268d01e7ec99b907321384c02468a53020386ee4fc819fabfc1cd0784323044931dac42437968d5fd37190da1b9f8f847af553a65a0595c33cecfd82c293
23 DIST llvm-gentoo-patchset-14.0.5.tar.xz 4072 BLAKE2B c35072f70831d5e3c9f7236f8473b098e6b8da4f27ce6a382ff4d3cd235837b25b9a1bc1e406ce0d3feb05e4d1e1c8bf141ff8f218568d5a5339fd1092f86b62 SHA512 646e0515a6cf1aae86f05db4797d7af6e3c9b8a6070f41cbd36535944029e0e5888128e33d8c44af22b5bb9ccba392b9dfeabc7708e5eab11858edefced6b68d
24 +DIST llvm-gentoo-patchset-14.0.6.tar.xz 4544 BLAKE2B b613582fa048837303168a2d62835688128621236022ca6c232293cb2e4549174ef256e7dcd8303bfef6d5456d0459ddb2cbda4a4d323b82901da4c16f15dcc4 SHA512 fb89a3186c5bffdc6245ed103d79fe6802a86986bd43891b7e128955bd546dffcb5b4083ac9e7966f67ce8dd82322756a11428ab4c62d21f012d614062adab35
25 DIST llvm-gentoo-patchset-9999-1.tar.xz 4032 BLAKE2B b9413484dafed8ae0c68c2c164b45fd07bb8d5d0898f03abe118fd2120ffcb1fb6c949de9649a97c2e8105f24b9d131a725c67c0a502ca4d4d192c1a0d65f49d SHA512 e64449eeaf756c5bd945109937b84ba4bd8a015222bd792d39cf3947871e87571a4ca57814790e51544cb05ad4c2d1f044e818e4caaac7c2e2a02cb1aa290fcc
26 DIST llvm-project-14.0.5.src.tar.xz 105617748 BLAKE2B a68a6eb58302702f560d1204eb97d34b695eb5df417ccefb50117dbd641ba3c3dda9e64c04506e646dd40c1151eb60b12843e206996ef74b35b2841b8dabafda SHA512 db5a7ea1149988c2aab4ed634f14e00bb9a8042089350b811f875e295ced7b5add80a11b91cad80ba0ba9801261502644a720021506483c14dfb1bc24a7f54d5
27 DIST llvm-project-14.0.5.src.tar.xz.sig 566 BLAKE2B ecf66df5d0acb382c9d441aee053404254fa4087d57130b04bb496af9cbb71c59e82f0938f44953d7fd777524781d13d1327b6c64065cf45b177bc3ea0e5c3f2 SHA512 a785e38f11863a46de8766ff4495a73173479cdbd95dc539804b0381a7a834a409713dbaf441272a9cc2963a3c7015c95dc6f0dcfa745e8d6047b1ad5feacff7
28 +DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f15e428f22a536a17e5f4e3eb29a003b8a8ec0abe0fa3e072591161d5f30ef7d8867c1ce34d1b341ad858e93c00263499941a99 SHA512 6fc6eeb60fac698702d1aac495fc0161eb7216a1f8db2020af8fccec5837831f7cc20dc2a169bf4f0b5f520748280b4a86621f3697d622aa58faaa45dbfaad13
29 +DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
30 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
31 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
32 DIST llvmorg-14.0.1.tar.gz 158074615 BLAKE2B bf80366461580058494eb101646efcd1a8b55a66818a710c2eb8c649bf88c02fe4552cecf4c1c8637a64e7cee8d644bca31aafc804765ed18f2b5e2975dd6c92 SHA512 0a15aa9cfc978a7b03a1659a2affad65ede66d280f5c12bf0beaaf194cd7bdd57ff438b5f40e64c1e1b88f368de99be349e9d30b544d2bbe4a50f0ebed3307f2
33
34 diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-14.0.6.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-14.0.6.ebuild
35 new file mode 100644
36 index 000000000000..433da0366bd7
37 --- /dev/null
38 +++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-14.0.6.ebuild
39 @@ -0,0 +1,221 @@
40 +# Copyright 1999-2022 Gentoo Authors
41 +# Distributed under the terms of the GNU General Public License v2
42 +
43 +EAPI=8
44 +
45 +PYTHON_COMPAT=( python3_{8..10} )
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="+abi_x86_32 abi_x86_64 +clang debug test"
55 +# base targets
56 +IUSE+=" +libfuzzer +memprof +orc +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 orc profile xray )
66 + test? (
67 + cfi? ( ubsan )
68 + gwp-asan? ( scudo )
69 + )
70 +"
71 +RESTRICT="
72 + !clang? ( test )
73 + !test? ( test )
74 +"
75 +
76 +CLANG_SLOT=${SLOT%%.*}
77 +# llvm-6 for new lit options
78 +DEPEND="
79 + >=sys-devel/llvm-6
80 + virtual/libcrypt[abi_x86_32(-)?,abi_x86_64(-)?]
81 +"
82 +BDEPEND="
83 + >=dev-util/cmake-3.16
84 + clang? ( sys-devel/clang )
85 + elibc_glibc? ( net-libs/libtirpc )
86 + test? (
87 + !<sys-apps/sandbox-2.13
88 + $(python_gen_any_dep ">=dev-python/lit-5[\${PYTHON_USEDEP}]")
89 + =sys-devel/clang-${PV%_*}*:${CLANG_SLOT}
90 + sys-libs/compiler-rt:${SLOT}
91 + )
92 + !test? (
93 + ${PYTHON_DEPS}
94 + )
95 +"
96 +
97 +LLVM_COMPONENTS=( compiler-rt cmake )
98 +LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )
99 +LLVM_PATCHSET=${PV}
100 +llvm.org_set_globals
101 +
102 +python_check_deps() {
103 + use test || return 0
104 + has_version "dev-python/lit[${PYTHON_USEDEP}]"
105 +}
106 +
107 +check_space() {
108 + if use test; then
109 + local CHECKREQS_DISK_BUILD=11G
110 + check-reqs_pkg_pretend
111 + fi
112 +}
113 +
114 +pkg_pretend() {
115 + check_space
116 +}
117 +
118 +pkg_setup() {
119 + check_space
120 + llvm_pkg_setup
121 + python-any-r1_pkg_setup
122 +}
123 +
124 +src_prepare() {
125 + sed -i -e 's:-Werror::' lib/tsan/go/buildgo.sh || die
126 +
127 + local flag
128 + for flag in "${SANITIZER_FLAGS[@]}"; do
129 + if ! use "${flag}"; then
130 + local cmake_flag=${flag/-/_}
131 + sed -i -e "/COMPILER_RT_HAS_${cmake_flag^^}/s:TRUE:FALSE:" \
132 + cmake/config-ix.cmake || die
133 + fi
134 + done
135 +
136 + # TODO: fix these tests to be skipped upstream
137 + if use asan && ! use profile; then
138 + rm test/asan/TestCases/asan_and_llvm_coverage_test.cpp || die
139 + fi
140 + if use ubsan && ! use cfi; then
141 + > test/cfi/CMakeLists.txt || die
142 + fi
143 +
144 + llvm.org_src_prepare
145 +}
146 +
147 +src_configure() {
148 + # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
149 + use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
150 +
151 + # pre-set since we need to pass it to cmake
152 + BUILD_DIR=${WORKDIR}/compiler-rt_build
153 +
154 + if use clang; then
155 + local -x CC=${CHOST}-clang
156 + local -x CXX=${CHOST}-clang++
157 + strip-unsupported-flags
158 + fi
159 +
160 + local flag want_sanitizer=OFF
161 + for flag in "${SANITIZER_FLAGS[@]}"; do
162 + if use "${flag}"; then
163 + want_sanitizer=ON
164 + break
165 + fi
166 + done
167 +
168 + local mycmakeargs=(
169 + -DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${SLOT}"
170 + # use a build dir structure consistent with install
171 + # this makes it possible to easily deploy test-friendly clang
172 + -DCOMPILER_RT_OUTPUT_DIR="${BUILD_DIR}/lib/clang/${SLOT}"
173 +
174 + -DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
175 + # builtins & crt installed by sys-libs/compiler-rt
176 + -DCOMPILER_RT_BUILD_BUILTINS=OFF
177 + -DCOMPILER_RT_BUILD_CRT=OFF
178 + -DCOMPILER_RT_BUILD_LIBFUZZER=$(usex libfuzzer)
179 + -DCOMPILER_RT_BUILD_MEMPROF=$(usex memprof)
180 + -DCOMPILER_RT_BUILD_ORC=$(usex orc)
181 + -DCOMPILER_RT_BUILD_PROFILE=$(usex profile)
182 + -DCOMPILER_RT_BUILD_SANITIZERS="${want_sanitizer}"
183 + -DCOMPILER_RT_BUILD_XRAY=$(usex xray)
184 +
185 + -DPython3_EXECUTABLE="${PYTHON}"
186 + )
187 +
188 + if use amd64; then
189 + mycmakeargs+=(
190 + -DCAN_TARGET_i386=$(usex abi_x86_32)
191 + -DCAN_TARGET_x86_64=$(usex abi_x86_64)
192 + )
193 + fi
194 +
195 + if use test; then
196 + mycmakeargs+=(
197 + -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
198 + -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
199 + -DLLVM_LIT_ARGS="$(get_lit_flags)"
200 +
201 + # they are created during src_test()
202 + -DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang"
203 + -DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang++"
204 + )
205 +
206 + # same flags are passed for build & tests, so we need to strip
207 + # them down to a subset supported by clang
208 + CC=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang \
209 + CXX=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++ \
210 + strip-unsupported-flags
211 + fi
212 +
213 + if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
214 + mycmakeargs+=(
215 + # setting -isysroot is disabled with compiler-rt-prefix-paths.patch
216 + # this allows adding arm64 support using SDK in EPREFIX
217 + -DDARWIN_macosx_CACHED_SYSROOT="${EPREFIX}/MacOSX.sdk"
218 + # Set version based on the SDK in EPREFIX
219 + # This disables i386 for SDK >= 10.15
220 + # Will error if has_use tsan and SDK < 10.12
221 + -DDARWIN_macosx_OVERRIDE_SDK_VERSION="$(realpath ${EPREFIX}/MacOSX.sdk | sed -e 's/.*MacOSX\(.*\)\.sdk/\1/')"
222 + # Use our libtool instead of looking it up with xcrun
223 + -DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool"
224 + )
225 + fi
226 +
227 + cmake_src_configure
228 +
229 + if use test; then
230 + local sys_dir=( "${EPREFIX}"/usr/lib/clang/${SLOT}/lib/* )
231 + [[ -e ${sys_dir} ]] || die "Unable to find ${sys_dir}"
232 + [[ ${#sys_dir[@]} -eq 1 ]] || die "Non-deterministic compiler-rt install: ${sys_dir[*]}"
233 +
234 + # copy clang over since resource_dir is located relatively to binary
235 + # therefore, we can put our new libraries in it
236 + mkdir -p "${BUILD_DIR}"/lib/{llvm/${CLANG_SLOT}/{bin,$(get_libdir)},clang/${SLOT}/include} || die
237 + cp "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/bin/clang{,++} \
238 + "${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/bin/ || die
239 + cp "${EPREFIX}"/usr/lib/clang/${SLOT}/include/*.h \
240 + "${BUILD_DIR}"/lib/clang/${SLOT}/include/ || die
241 + cp "${sys_dir}"/*builtins*.a \
242 + "${BUILD_DIR}/lib/clang/${SLOT}/lib/${sys_dir##*/}/" || die
243 + # we also need LLVMgold.so for gold-based tests
244 + if [[ -f ${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so ]]; then
245 + ln -s "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so \
246 + "${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/$(get_libdir)/ || die
247 + fi
248 + fi
249 +}
250 +
251 +src_test() {
252 + # respect TMPDIR!
253 + local -x LIT_PRESERVES_TMP=1
254 + # disable sandbox to have it stop clobbering LD_PRELOAD
255 + local -x SANDBOX_ON=0
256 + # wipe LD_PRELOAD to make ASAN happy
257 + local -x LD_PRELOAD=
258 +
259 + cmake_build check-all
260 +}