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