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: Mon, 17 May 2021 06:49:58
Message-Id: 1621234160.dac3581408066b18310175d503ba5888a3d15be9.mgorny@gentoo
1 commit: dac3581408066b18310175d503ba5888a3d15be9
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Mon May 17 06:48:02 2021 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Mon May 17 06:49:20 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dac35814
7
8 sys-libs/compiler-rt-sanitizers: Remove 11.0.0
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-11.0.0-r1.ebuild | 159 ---------------------
14 2 files changed, 161 deletions(-)
15
16 diff --git a/sys-libs/compiler-rt-sanitizers/Manifest b/sys-libs/compiler-rt-sanitizers/Manifest
17 index 9454f72042f..bae10764b11 100644
18 --- a/sys-libs/compiler-rt-sanitizers/Manifest
19 +++ b/sys-libs/compiler-rt-sanitizers/Manifest
20 @@ -1,10 +1,8 @@
21 DIST llvm-gentoo-patchset-10.0.1-2.tar.xz 9016 BLAKE2B 50cebbc89f962e741111d0cd6ed108c0ad1bd4f3c83d27be592af7607c8cff953be7ad797ba03dc9fae403c39a2dd1dc942a84be064c2a574a0e234ac0e5593d SHA512 d610dde051e1e797f02ce7c0543187cf850465665fe5c51d3b8af8a944478803837dc05abca6636072ca7249a4a3d2884130b3f94c88e56be1aa75c7c5b6c747
22 -DIST llvm-gentoo-patchset-11.0.0-2.tar.xz 6752 BLAKE2B a2b8f88500844e277423e019e20bdfb53da761f33c0cf01ef028cb73b01273420bd492590821b28a6afbeaaaca8ef4d4eb410d86e44d918124ccc2c064bc8df8 SHA512 33fb68077960714a33bd1d86ad0e8981ee3a9de44b3e147c1d5333da59170b5fab8b21474b49e22b21929def27847c93dcd8bf41a5940b937b3e04a59a2f417f
23 DIST llvm-gentoo-patchset-11.1.0-2.tar.xz 4732 BLAKE2B 5ec43d404e9ba446171f743609717ca658db3e03ea197866569aca180ec733cf3b7a1880ef3e52f9912538f83ca8ddeaf4dccab4622a1e574f5b499745b0be1c SHA512 845ed0defdb3742a814e6b2283788c7c9e6e28eabcd48f9fb5c5a99063514af7c7610415619f4a8b993312866ac7a316a1f1408cd8086bae85db52ec652327b9
24 DIST llvm-gentoo-patchset-12.0.0-1.tar.xz 6364 BLAKE2B bcf96dad8300cdc3e1f416cb90935ae3b1359efc5687118b5a9bbee25de7087a266250f50c6f2abd18f4efeeec19354f59513c8fdd1d61c2cfc8cc2f0115e514 SHA512 76201e169f71a8d568365ffeafcfd37138e74b0536826f47eb6ce89c2280586f10426917e851f99bfb20477cd828cc40daa8cb7a62959981620fbd81e1b22ee1
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.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984 SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2
28 DIST llvmorg-11.0.1.tar.gz 122790338 BLAKE2B 0130996b4a8c4d9f757136fd7fb318068c9bfdc565060dec0d4336480c4ab66c4ae3185a7fdb05f13cf9ee8fd4123b09df938881b75d6e5d3689595114b7e32a SHA512 f5e6ef0b3111aae08a89cd01adb2ff4abfa9ef779c68b9190421d0447efd25c2cc00e5aae9f4764805f5fa31434866043d1510ae7389817e28ae53a5442e2fdf
29 DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
30 DIST llvmorg-12.0.0.tar.gz 134226215 BLAKE2B f9c3ba8c58571855caa4f206fd285c9b5be66672fb0814cb8bc0964a051f57f5d35013aa1e27cbda502652b37df1ec23474129109e76a42066847860db441dbe SHA512 0cff02155c5ac0d6db2b72d60d9819d5b5dd859663b45f721b1c7540239c2fceb1f57d9173f6870c49de851c242ed8e85c5c6d6577a1f8092a7c5dcd12513b26
31
32 diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.0.0-r1.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.0.0-r1.ebuild
33 deleted file mode 100644
34 index 61b07d7232e..00000000000
35 --- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.0.0-r1.ebuild
36 +++ /dev/null
37 @@ -1,159 +0,0 @@
38 -# Copyright 1999-2021 Gentoo Authors
39 -# Distributed under the terms of the GNU General Public License v2
40 -
41 -EAPI=7
42 -
43 -PYTHON_COMPAT=( python3_{7..9} )
44 -inherit check-reqs cmake flag-o-matic llvm llvm.org python-any-r1
45 -
46 -DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)"
47 -HOMEPAGE="https://llvm.org/"
48 -LLVM_COMPONENTS=( compiler-rt )
49 -LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )
50 -LLVM_PATCHSET=11.0.0-2
51 -llvm.org_set_globals
52 -
53 -LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
54 -SLOT="$(ver_cut 1-3)"
55 -KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86 ~amd64-linux ~ppc-macos ~x64-macos"
56 -IUSE="+clang +libfuzzer +profile +sanitize test +xray elibc_glibc"
57 -# FIXME: libfuzzer does not enable all its necessary dependencies
58 -REQUIRED_USE="libfuzzer? ( || ( sanitize xray ) )"
59 -RESTRICT="!test? ( test ) !clang? ( test )"
60 -
61 -CLANG_SLOT=${SLOT%%.*}
62 -# llvm-6 for new lit options
63 -DEPEND="
64 - >=sys-devel/llvm-6"
65 -BDEPEND="
66 - >=dev-util/cmake-3.16
67 - clang? ( sys-devel/clang )
68 - elibc_glibc? ( net-libs/libtirpc )
69 - test? (
70 - !<sys-apps/sandbox-2.13
71 - $(python_gen_any_dep ">=dev-python/lit-5[\${PYTHON_USEDEP}]")
72 - =sys-devel/clang-${PV%_*}*:${CLANG_SLOT}
73 - sys-libs/compiler-rt:${SLOT} )
74 - ${PYTHON_DEPS}"
75 -
76 -python_check_deps() {
77 - use test || return 0
78 - has_version "dev-python/lit[${PYTHON_USEDEP}]"
79 -}
80 -
81 -check_space() {
82 - if use test; then
83 - local CHECKREQS_DISK_BUILD=11G
84 - check-reqs_pkg_pretend
85 - fi
86 -}
87 -
88 -pkg_pretend() {
89 - check_space
90 -}
91 -
92 -pkg_setup() {
93 - check_space
94 - llvm_pkg_setup
95 - python-any-r1_pkg_setup
96 -}
97 -
98 -src_prepare() {
99 - sed -i -e 's:-Werror::' lib/tsan/go/buildgo.sh || die
100 -
101 - llvm.org_src_prepare
102 -}
103 -
104 -src_configure() {
105 - # pre-set since we need to pass it to cmake
106 - BUILD_DIR=${WORKDIR}/compiler-rt_build
107 -
108 - if use clang; then
109 - local -x CC=${CHOST}-clang
110 - local -x CXX=${CHOST}-clang++
111 - strip-unsupported-flags
112 - fi
113 -
114 - local mycmakeargs=(
115 - -DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${SLOT}"
116 - # use a build dir structure consistent with install
117 - # this makes it possible to easily deploy test-friendly clang
118 - -DCOMPILER_RT_OUTPUT_DIR="${BUILD_DIR}/lib/clang/${SLOT}"
119 -
120 - -DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
121 - # builtins & crt installed by sys-libs/compiler-rt
122 - -DCOMPILER_RT_BUILD_BUILTINS=OFF
123 - -DCOMPILER_RT_BUILD_CRT=OFF
124 - -DCOMPILER_RT_BUILD_LIBFUZZER=$(usex libfuzzer)
125 - -DCOMPILER_RT_BUILD_PROFILE=$(usex profile)
126 - -DCOMPILER_RT_BUILD_SANITIZERS=$(usex sanitize)
127 - -DCOMPILER_RT_BUILD_XRAY=$(usex xray)
128 -
129 - -DPython3_EXECUTABLE="${PYTHON}"
130 - )
131 - if use test; then
132 - mycmakeargs+=(
133 - -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
134 - -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
135 - -DLLVM_LIT_ARGS="$(get_lit_flags)"
136 -
137 - # they are created during src_test()
138 - -DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang"
139 - -DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang++"
140 - )
141 -
142 - # same flags are passed for build & tests, so we need to strip
143 - # them down to a subset supported by clang
144 - CC=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang \
145 - CXX=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++ \
146 - strip-unsupported-flags
147 - fi
148 -
149 - if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
150 - mycmakeargs+=(
151 - # setting -isysroot is disabled with compiler-rt-prefix-paths.patch
152 - # this allows adding arm64 support using SDK in EPREFIX
153 - -DDARWIN_macosx_CACHED_SYSROOT="${EPREFIX}/MacOSX.sdk"
154 - # Set version based on the SDK in EPREFIX
155 - # This disables i386 for SDK >= 10.15
156 - # Will error while building tsan if SDK < 10.12
157 - -DDARWIN_macosx_OVERRIDE_SDK_VERSION="$(realpath ${EPREFIX}/MacOSX.sdk | sed -e 's/.*MacOSX\(.*\)\.sdk/\1/')"
158 - # Use our libtool instead of looking it up with xcrun
159 - -DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool"
160 - )
161 - fi
162 -
163 - cmake_src_configure
164 -
165 - if use test; then
166 - local sys_dir=( "${EPREFIX}"/usr/lib/clang/${SLOT}/lib/* )
167 - [[ -e ${sys_dir} ]] || die "Unable to find ${sys_dir}"
168 - [[ ${#sys_dir[@]} -eq 1 ]] || die "Non-deterministic compiler-rt install: ${sys_dir[*]}"
169 -
170 - # copy clang over since resource_dir is located relatively to binary
171 - # therefore, we can put our new libraries in it
172 - mkdir -p "${BUILD_DIR}"/lib/{llvm/${CLANG_SLOT}/{bin,$(get_libdir)},clang/${SLOT}/include} || die
173 - cp "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/bin/clang{,++} \
174 - "${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/bin/ || die
175 - cp "${EPREFIX}"/usr/lib/clang/${SLOT}/include/*.h \
176 - "${BUILD_DIR}"/lib/clang/${SLOT}/include/ || die
177 - cp "${sys_dir}"/*builtins*.a \
178 - "${BUILD_DIR}/lib/clang/${SLOT}/lib/${sys_dir##*/}/" || die
179 - # we also need LLVMgold.so for gold-based tests
180 - if [[ -f ${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so ]]; then
181 - ln -s "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so \
182 - "${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/$(get_libdir)/ || die
183 - fi
184 - fi
185 -}
186 -
187 -src_test() {
188 - # respect TMPDIR!
189 - local -x LIT_PRESERVES_TMP=1
190 - # disable sandbox to have it stop clobbering LD_PRELOAD
191 - local -x SANDBOX_ON=0
192 - # wipe LD_PRELOAD to make ASAN happy
193 - local -x LD_PRELOAD=
194 -
195 - cmake_build check-all
196 -}