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 Sep 2021 07:46:05
Message-Id: 1632555936.4da7cf50f587ce006c2044c5e62d77324d3f965b.mgorny@gentoo
1 commit: 4da7cf50f587ce006c2044c5e62d77324d3f965b
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sat Sep 25 07:02:05 2021 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sat Sep 25 07:45:36 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4da7cf50
7
8 sys-libs/compiler-rt-sanitizers: Bump to 13.0.0_rc4
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.0_rc4.ebuild | 201 +++++++++++++++++++++
14 2 files changed, 203 insertions(+)
15
16 diff --git a/sys-libs/compiler-rt-sanitizers/Manifest b/sys-libs/compiler-rt-sanitizers/Manifest
17 index ab274f138d6..bd1f03ff84d 100644
18 --- a/sys-libs/compiler-rt-sanitizers/Manifest
19 +++ b/sys-libs/compiler-rt-sanitizers/Manifest
20 @@ -3,9 +3,11 @@ 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-rc2.tar.xz 5556 BLAKE2B e6c7ecfe8f842edc4d4f30a20c66973519182ecb46e21fb20b6c5fcb6d54cdef830fcb120a405b77f1332e3557acbbbbfa99170b20d17f137e0a63b2d0dc1258 SHA512 ddeaf1d07f0ba893ce93e5fe1eff1c0716769a7879fc503c397f4db7becb363f94747f59b6d53c204df73a93954fb0ca5aae6ad544ce55c964c4bf441a410cd2
23 DIST llvm-gentoo-patchset-13.0.0-rc3.tar.xz 5012 BLAKE2B 5399feeffe73e8fbd099c8058f1cc41e2fcb2feb446acc1394589c0397167786895d328d45ff481fb30605f215774b9e51e332124c0b071e969a2f01c5943c04 SHA512 d4fb2b08e253d9fa89070045282b4309ca9938011bf7f9b5364cc69c5030ff9353abb1624895b4bfeef2cd8e2f8c9b9f93fc8196f98dc0970457bca7787270c9
24 +DIST llvm-gentoo-patchset-13.0.0-rc4.tar.xz 5016 BLAKE2B 021ba4e67904e4cf4dfdf1ecfc1cd1cc860c2f43db97e04c40ca7d95567f6235a27a2a919083c58b89b269eefa2d751cb9c324bda6518c22e9fc01007936a520 SHA512 dce61179dffafc5992fb0e18314bba2d5fbf2f0470a491bc1ffc036274b65d0a1de741b23e2de32e873250c856a53707e06f8c560bd29f8a54a6ae0c74267f43
25 DIST llvm-gentoo-patchset-9999-1.tar.xz 4032 BLAKE2B b9413484dafed8ae0c68c2c164b45fd07bb8d5d0898f03abe118fd2120ffcb1fb6c949de9649a97c2e8105f24b9d131a725c67c0a502ca4d4d192c1a0d65f49d SHA512 e64449eeaf756c5bd945109937b84ba4bd8a015222bd792d39cf3947871e87571a4ca57814790e51544cb05ad4c2d1f044e818e4caaac7c2e2a02cb1aa290fcc
26 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
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-rc2.tar.gz 147267736 BLAKE2B 153bf7320f2aa911112d366ffc79f7110cb04f135c2a8b176c263f0a75eb768206d9bd462893d45504b0e58aa9e127fdcafb02300eab1666e4616aa654d457dd SHA512 a01baf3eaa02f02af42bfcf6dcf24f166351bf1c09601495617c81e41def23210573bad40a344270f40c5deb881d06863536abac2a6481930766a6a56335fb44
30 DIST llvmorg-13.0.0-rc3.tar.gz 147281901 BLAKE2B 640065a2f32dc48edf084d776cb6b950fae86c2a204999e2eec67f93b57615df40adec19785099b0ef2fe11837c3304794ec3585289a5b5051a557618c63c749 SHA512 1401d5a4d6bb5c930d74b9cfbc8e792872f721aab7d7f0c819e2ba5cf47fb818d160c1f71784fba69827f3c9b7414aa91a585d2b813c1851b4799f9d62cebc46
31 +DIST llvmorg-13.0.0-rc4.tar.gz 147286367 BLAKE2B a43c54b8bb379b0374f99ae07066d7ba4ae2a83dfdb61390101c736f91dc44aa07a88778551aaaf903033562b2a0a863ea6b27392b700c9cddc74e2c7899cad1 SHA512 8ccaaea21ec4fe3c4b4446d3a7cae36a47ed196f407d341da45824bcefefffd3c412c0c5c27670ceaba1458bc53107273f9d3aec2de261b6b82c6d209b45b14d
32
33 diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.0_rc4.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.0_rc4.ebuild
34 new file mode 100644
35 index 00000000000..2bc8c92f6b0
36 --- /dev/null
37 +++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.0_rc4.ebuild
38 @@ -0,0 +1,201 @@
39 +# Copyright 1999-2021 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="+clang test elibc_glibc"
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 +BDEPEND="
76 + >=dev-util/cmake-3.16
77 + clang? ( sys-devel/clang )
78 + elibc_glibc? ( net-libs/libtirpc )
79 + test? (
80 + !<sys-apps/sandbox-2.13
81 + $(python_gen_any_dep ">=dev-python/lit-5[\${PYTHON_USEDEP}]")
82 + =sys-devel/clang-${PV%_*}*:${CLANG_SLOT}
83 + sys-libs/compiler-rt:${SLOT}
84 + )
85 + ${PYTHON_DEPS}"
86 +
87 +LLVM_COMPONENTS=( compiler-rt )
88 +LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )
89 +LLVM_PATCHSET=${PV/_/-}
90 +llvm.org_set_globals
91 +
92 +python_check_deps() {
93 + use test || return 0
94 + has_version "dev-python/lit[${PYTHON_USEDEP}]"
95 +}
96 +
97 +check_space() {
98 + if use test; then
99 + local CHECKREQS_DISK_BUILD=11G
100 + check-reqs_pkg_pretend
101 + fi
102 +}
103 +
104 +pkg_pretend() {
105 + check_space
106 +}
107 +
108 +pkg_setup() {
109 + check_space
110 + llvm_pkg_setup
111 + python-any-r1_pkg_setup
112 +}
113 +
114 +src_prepare() {
115 + sed -i -e 's:-Werror::' lib/tsan/go/buildgo.sh || die
116 +
117 + local flag
118 + for flag in "${SANITIZER_FLAGS[@]}"; do
119 + if ! use "${flag}"; then
120 + local cmake_flag=${flag/-/_}
121 + sed -i -e "/COMPILER_RT_HAS_${cmake_flag^^}/s:TRUE:FALSE:" \
122 + cmake/config-ix.cmake || die
123 + fi
124 + done
125 +
126 + # TODO: fix these tests to be skipped upstream
127 + if use asan && ! use profile; then
128 + rm test/asan/TestCases/asan_and_llvm_coverage_test.cpp || die
129 + fi
130 + if use ubsan && ! use cfi; then
131 + > test/cfi/CMakeLists.txt || die
132 + fi
133 +
134 + llvm.org_src_prepare
135 +}
136 +
137 +src_configure() {
138 + # pre-set since we need to pass it to cmake
139 + BUILD_DIR=${WORKDIR}/compiler-rt_build
140 +
141 + if use clang; then
142 + local -x CC=${CHOST}-clang
143 + local -x CXX=${CHOST}-clang++
144 + strip-unsupported-flags
145 + fi
146 +
147 + local flag want_sanitizer=OFF
148 + for flag in "${SANITIZER_FLAGS[@]}"; do
149 + if use "${flag}"; then
150 + want_sanitizer=ON
151 + break
152 + fi
153 + done
154 +
155 + local mycmakeargs=(
156 + -DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${SLOT}"
157 + # use a build dir structure consistent with install
158 + # this makes it possible to easily deploy test-friendly clang
159 + -DCOMPILER_RT_OUTPUT_DIR="${BUILD_DIR}/lib/clang/${SLOT}"
160 +
161 + -DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
162 + # builtins & crt installed by sys-libs/compiler-rt
163 + -DCOMPILER_RT_BUILD_BUILTINS=OFF
164 + -DCOMPILER_RT_BUILD_CRT=OFF
165 + -DCOMPILER_RT_BUILD_LIBFUZZER=$(usex libfuzzer)
166 + -DCOMPILER_RT_BUILD_MEMPROF=$(usex memprof)
167 + -DCOMPILER_RT_BUILD_ORC=$(usex orc)
168 + -DCOMPILER_RT_BUILD_PROFILE=$(usex profile)
169 + -DCOMPILER_RT_BUILD_SANITIZERS="${want_sanitizer}"
170 + -DCOMPILER_RT_BUILD_XRAY=$(usex xray)
171 +
172 + -DPython3_EXECUTABLE="${PYTHON}"
173 + )
174 + if use test; then
175 + mycmakeargs+=(
176 + -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
177 + -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
178 + -DLLVM_LIT_ARGS="$(get_lit_flags)"
179 +
180 + # they are created during src_test()
181 + -DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang"
182 + -DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang++"
183 + )
184 +
185 + # same flags are passed for build & tests, so we need to strip
186 + # them down to a subset supported by clang
187 + CC=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang \
188 + CXX=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++ \
189 + strip-unsupported-flags
190 + fi
191 +
192 + if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
193 + mycmakeargs+=(
194 + # setting -isysroot is disabled with compiler-rt-prefix-paths.patch
195 + # this allows adding arm64 support using SDK in EPREFIX
196 + -DDARWIN_macosx_CACHED_SYSROOT="${EPREFIX}/MacOSX.sdk"
197 + # Set version based on the SDK in EPREFIX
198 + # This disables i386 for SDK >= 10.15
199 + # Will error if has_use tsan and SDK < 10.12
200 + -DDARWIN_macosx_OVERRIDE_SDK_VERSION="$(realpath ${EPREFIX}/MacOSX.sdk | sed -e 's/.*MacOSX\(.*\)\.sdk/\1/')"
201 + # Use our libtool instead of looking it up with xcrun
202 + -DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool"
203 + )
204 + fi
205 +
206 + cmake_src_configure
207 +
208 + if use test; then
209 + local sys_dir=( "${EPREFIX}"/usr/lib/clang/${SLOT}/lib/* )
210 + [[ -e ${sys_dir} ]] || die "Unable to find ${sys_dir}"
211 + [[ ${#sys_dir[@]} -eq 1 ]] || die "Non-deterministic compiler-rt install: ${sys_dir[*]}"
212 +
213 + # copy clang over since resource_dir is located relatively to binary
214 + # therefore, we can put our new libraries in it
215 + mkdir -p "${BUILD_DIR}"/lib/{llvm/${CLANG_SLOT}/{bin,$(get_libdir)},clang/${SLOT}/include} || die
216 + cp "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/bin/clang{,++} \
217 + "${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/bin/ || die
218 + cp "${EPREFIX}"/usr/lib/clang/${SLOT}/include/*.h \
219 + "${BUILD_DIR}"/lib/clang/${SLOT}/include/ || die
220 + cp "${sys_dir}"/*builtins*.a \
221 + "${BUILD_DIR}/lib/clang/${SLOT}/lib/${sys_dir##*/}/" || die
222 + # we also need LLVMgold.so for gold-based tests
223 + if [[ -f ${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so ]]; then
224 + ln -s "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so \
225 + "${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/$(get_libdir)/ || die
226 + fi
227 + fi
228 +}
229 +
230 +src_test() {
231 + # respect TMPDIR!
232 + local -x LIT_PRESERVES_TMP=1
233 + # disable sandbox to have it stop clobbering LD_PRELOAD
234 + local -x SANDBOX_ON=0
235 + # wipe LD_PRELOAD to make ASAN happy
236 + local -x LD_PRELOAD=
237 +
238 + cmake_build check-all
239 +}