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: Sun, 29 Nov 2020 08:26:15
Message-Id: 1606638357.11a760d868f9793458fe2279a5388ba30f48d515.mgorny@gentoo
1 commit: 11a760d868f9793458fe2279a5388ba30f48d515
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sun Nov 29 08:23:23 2020 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sun Nov 29 08:25:57 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11a760d8
7
8 sys-libs/compiler-rt-sanitizers: Remove 10.0.0
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-10.0.0.ebuild | 146 ---------------------
14 2 files changed, 147 deletions(-)
15
16 diff --git a/sys-libs/compiler-rt-sanitizers/Manifest b/sys-libs/compiler-rt-sanitizers/Manifest
17 index 52eb105e0cf..11ed9f91a47 100644
18 --- a/sys-libs/compiler-rt-sanitizers/Manifest
19 +++ b/sys-libs/compiler-rt-sanitizers/Manifest
20 @@ -1,4 +1,3 @@
21 -DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
22 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
23 DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984 SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2
24 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
25
26 diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.0.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.0.ebuild
27 deleted file mode 100644
28 index 802b49fc451..00000000000
29 --- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.0.ebuild
30 +++ /dev/null
31 @@ -1,146 +0,0 @@
32 -# Copyright 1999-2020 Gentoo Authors
33 -# Distributed under the terms of the GNU General Public License v2
34 -
35 -EAPI=7
36 -
37 -PYTHON_COMPAT=( python3_{6,7,8} )
38 -inherit check-reqs cmake-utils flag-o-matic llvm llvm.org \
39 - multiprocessing python-any-r1
40 -
41 -DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)"
42 -HOMEPAGE="https://llvm.org/"
43 -LLVM_COMPONENTS=( compiler-rt )
44 -LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )
45 -llvm.org_set_globals
46 -
47 -LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
48 -SLOT="$(ver_cut 1-3)"
49 -KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
50 -IUSE="+clang +libfuzzer +profile +sanitize test +xray elibc_glibc"
51 -# FIXME: libfuzzer does not enable all its necessary dependencies
52 -REQUIRED_USE="libfuzzer? ( || ( sanitize xray ) )"
53 -RESTRICT="!test? ( test ) !clang? ( test )"
54 -
55 -CLANG_SLOT=${SLOT%%.*}
56 -# llvm-6 for new lit options
57 -DEPEND="
58 - >=sys-devel/llvm-6"
59 -BDEPEND="
60 - clang? ( sys-devel/clang )
61 - elibc_glibc? ( net-libs/libtirpc )
62 - test? (
63 - !<sys-apps/sandbox-2.13
64 - $(python_gen_any_dep ">=dev-python/lit-5[\${PYTHON_USEDEP}]")
65 - =sys-devel/clang-${PV%_*}*:${CLANG_SLOT}
66 - sys-libs/compiler-rt:${SLOT} )
67 - ${PYTHON_DEPS}"
68 -
69 -# least intrusive of all
70 -CMAKE_BUILD_TYPE=RelWithDebInfo
71 -
72 -python_check_deps() {
73 - use test || return 0
74 - has_version "dev-python/lit[${PYTHON_USEDEP}]"
75 -}
76 -
77 -check_space() {
78 - if use test; then
79 - local CHECKREQS_DISK_BUILD=11G
80 - check-reqs_pkg_pretend
81 - fi
82 -}
83 -
84 -pkg_pretend() {
85 - check_space
86 -}
87 -
88 -pkg_setup() {
89 - check_space
90 - llvm_pkg_setup
91 - python-any-r1_pkg_setup
92 -}
93 -
94 -src_configure() {
95 - # pre-set since we need to pass it to cmake
96 - BUILD_DIR=${WORKDIR}/compiler-rt_build
97 -
98 - if use clang; then
99 - local -x CC=${CHOST}-clang
100 - local -x CXX=${CHOST}-clang++
101 - strip-unsupported-flags
102 - fi
103 -
104 - local mycmakeargs=(
105 - -DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${SLOT}"
106 - # use a build dir structure consistent with install
107 - # this makes it possible to easily deploy test-friendly clang
108 - -DCOMPILER_RT_OUTPUT_DIR="${BUILD_DIR}/lib/clang/${SLOT}"
109 -
110 - -DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
111 - # builtins & crt installed by sys-libs/compiler-rt
112 - -DCOMPILER_RT_BUILD_BUILTINS=OFF
113 - -DCOMPILER_RT_BUILD_CRT=OFF
114 - -DCOMPILER_RT_BUILD_LIBFUZZER=$(usex libfuzzer)
115 - -DCOMPILER_RT_BUILD_PROFILE=$(usex profile)
116 - -DCOMPILER_RT_BUILD_SANITIZERS=$(usex sanitize)
117 - -DCOMPILER_RT_BUILD_XRAY=$(usex xray)
118 - )
119 - if use test; then
120 - mycmakeargs+=(
121 - -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
122 - -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
123 - -DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
124 -
125 - # they are created during src_test()
126 - -DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang"
127 - -DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang++"
128 - )
129 -
130 - # same flags are passed for build & tests, so we need to strip
131 - # them down to a subset supported by clang
132 - CC=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang \
133 - CXX=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++ \
134 - strip-unsupported-flags
135 - fi
136 -
137 - if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
138 - mycmakeargs+=(
139 - # disable use of SDK for the system itself
140 - -DDARWIN_macosx_CACHED_SYSROOT=/
141 - )
142 - fi
143 -
144 - cmake-utils_src_configure
145 -
146 - if use test; then
147 - local sys_dir=( "${EPREFIX}"/usr/lib/clang/${SLOT}/lib/* )
148 - [[ -e ${sys_dir} ]] || die "Unable to find ${sys_dir}"
149 - [[ ${#sys_dir[@]} -eq 1 ]] || die "Non-deterministic compiler-rt install: ${sys_dir[*]}"
150 -
151 - # copy clang over since resource_dir is located relatively to binary
152 - # therefore, we can put our new libraries in it
153 - mkdir -p "${BUILD_DIR}"/lib/{llvm/${CLANG_SLOT}/{bin,$(get_libdir)},clang/${SLOT}/include} || die
154 - cp "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/bin/clang{,++} \
155 - "${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/bin/ || die
156 - cp "${EPREFIX}"/usr/lib/clang/${SLOT}/include/*.h \
157 - "${BUILD_DIR}"/lib/clang/${SLOT}/include/ || die
158 - cp "${sys_dir}"/*builtins*.a \
159 - "${BUILD_DIR}/lib/clang/${SLOT}/lib/${sys_dir##*/}/" || die
160 - # we also need LLVMgold.so for gold-based tests
161 - if [[ -f ${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so ]]; then
162 - ln -s "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so \
163 - "${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/$(get_libdir)/ || die
164 - fi
165 - fi
166 -}
167 -
168 -src_test() {
169 - # respect TMPDIR!
170 - local -x LIT_PRESERVES_TMP=1
171 - # disable sandbox to have it stop clobbering LD_PRELOAD
172 - local -x SANDBOX_ON=0
173 - # wipe LD_PRELOAD to make ASAN happy
174 - local -x LD_PRELOAD=
175 -
176 - cmake-utils_src_make check-all
177 -}