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