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/
Date: Wed, 04 Mar 2020 18:39:21
Message-Id: 1583347139.6fe4b63b8eff7aebf9945467aed1fabd9103b512.mgorny@gentoo
1 commit: 6fe4b63b8eff7aebf9945467aed1fabd9103b512
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed Mar 4 18:12:49 2020 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed Mar 4 18:38:59 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fe4b63b
7
8 sys-libs/compiler-rt: Remove 10.0.0rc[12]
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 sys-libs/compiler-rt/Manifest | 2 -
13 sys-libs/compiler-rt/compiler-rt-10.0.0_rc1.ebuild | 110 ---------------------
14 sys-libs/compiler-rt/compiler-rt-10.0.0_rc2.ebuild | 110 ---------------------
15 3 files changed, 222 deletions(-)
16
17 diff --git a/sys-libs/compiler-rt/Manifest b/sys-libs/compiler-rt/Manifest
18 index a4c5d06cc02..7617a19a991 100644
19 --- a/sys-libs/compiler-rt/Manifest
20 +++ b/sys-libs/compiler-rt/Manifest
21 @@ -1,6 +1,4 @@
22 DIST compiler-rt-7.1.0.src.tar.xz 1864248 BLAKE2B 42ab86416f7f85c5833cf85dbfb66b18a5d5cf53fa0560ad43b2ef39f5a2cd7ec1dbe4192cc8dac9b3f658b828c8306f26745c4d0e8f846d9f550ac22717eb33 SHA512 54d3ad80936f011dbf2ecebba3f1b7d4a156044b178228411ba855be5ec48eb646155b74dea1a96674adab6f93803456ae1435395e3240a4423a3f65f4566b55
23 DIST compiler-rt-8.0.1.src.tar.xz 1954204 BLAKE2B cbba1d5fb37385116920da39dea26739d09e3f11c392503f8bc45293f1ef00c97f6a9fbd3ba67094d7f1e532410d0eca461943dadfdb10646110470a8e3b5f1f SHA512 12bf1bdabe25c0c3a84cc73a718fe154573dd729ec3ff5e099bd5f74c6bec9c80521b87ded646d3b20dfdb9aa51dea0234281418c7eb81805e1dd5d3107d3d8e
24 -DIST llvmorg-10.0.0-rc1.tar.gz 120755822 BLAKE2B a729d37d96ba498cb865c6f708734dccb796b2caabb69167b9aa3b0e12c788f2a5980a048b99d5603da3d26af909fb31f406b4f4743cabae56c45f829a7bf695 SHA512 27137fc700971147c00ded6787eaae9f0bcf98c938fe227a5a559b38d983736f3d086f4ff6772d802c5f48a7d97a97c293261e4af88fcb5a720693b9cb5a4f02
25 -DIST llvmorg-10.0.0-rc2.tar.gz 120795019 BLAKE2B 6e701eddbd2313e777c7b37dff8455a08d3c599d01055b60afc0319373d4709deb429aac6bf9e80c4d2e2ab8ade03bf5b398b6ccd8882e4bde608d10cdbf2284 SHA512 ee571c9258a2d9fc411964f56b0b92b2e7134349ed21dbe7963eb61ef65da506e0c4f7c69259a3b6cecec23f55d24636608287ee4457ee667031e141f8f09aae
26 DIST llvmorg-10.0.0-rc3.tar.gz 120814170 BLAKE2B 432fe0c1e74d3020a269a256e6e456cbfa0b7166dd3f86df6caf3a55e1931c022285fe8afdc4d8998c729c5471acf5308abb336782ddec2ef9b0f58d1ccb5a3c SHA512 aad1df86063612d20c48ea7046940330fe2ac572a146be22ff71d9e65fa3438184cb39a2533fc6afd1e74df26909a9f0d24ebcd7d62e74728cfd81e447f2ffbf
27 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
28
29 diff --git a/sys-libs/compiler-rt/compiler-rt-10.0.0_rc1.ebuild b/sys-libs/compiler-rt/compiler-rt-10.0.0_rc1.ebuild
30 deleted file mode 100644
31 index 4237b872c6e..00000000000
32 --- a/sys-libs/compiler-rt/compiler-rt-10.0.0_rc1.ebuild
33 +++ /dev/null
34 @@ -1,110 +0,0 @@
35 -# Copyright 1999-2020 Gentoo Authors
36 -# Distributed under the terms of the GNU General Public License v2
37 -
38 -EAPI=7
39 -
40 -PYTHON_COMPAT=( python3_{6,7} )
41 -inherit cmake-utils flag-o-matic llvm llvm.org multiprocessing \
42 - python-any-r1 toolchain-funcs
43 -
44 -DESCRIPTION="Compiler runtime library for clang (built-in part)"
45 -HOMEPAGE="https://llvm.org/"
46 -LLVM_COMPONENTS=( compiler-rt )
47 -llvm.org_set_globals
48 -
49 -LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
50 -SLOT="$(ver_cut 1-3)"
51 -KEYWORDS=""
52 -IUSE="+clang test"
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 - test? (
62 - $(python_gen_any_dep ">=dev-python/lit-9.0.1[\${PYTHON_USEDEP}]")
63 - =sys-devel/clang-${PV%_*}*:${CLANG_SLOT} )
64 - ${PYTHON_DEPS}"
65 -
66 -# least intrusive of all
67 -CMAKE_BUILD_TYPE=RelWithDebInfo
68 -
69 -python_check_deps() {
70 - use test || return 0
71 - has_version "dev-python/lit[${PYTHON_USEDEP}]"
72 -}
73 -
74 -pkg_pretend() {
75 - if ! use clang && ! tc-is-clang; then
76 - ewarn "Building using a compiler other than clang may result in broken atomics"
77 - ewarn "library. Enable USE=clang unless you have a very good reason not to."
78 - fi
79 -}
80 -
81 -pkg_setup() {
82 - llvm_pkg_setup
83 - python-any-r1_pkg_setup
84 -}
85 -
86 -test_compiler() {
87 - $(tc-getCC) ${CFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c - \
88 - <<<'int main() { return 0; }' &>/dev/null
89 -}
90 -
91 -src_configure() {
92 - # pre-set since we need to pass it to cmake
93 - BUILD_DIR=${WORKDIR}/${P}_build
94 -
95 - local nolib_flags=( -nodefaultlibs -lc )
96 - if use clang; then
97 - local -x CC=${CHOST}-clang
98 - local -x CXX=${CHOST}-clang++
99 - strip-unsupported-flags
100 - # ensure we can use clang before installing compiler-rt
101 - local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
102 - elif ! test_compiler; then
103 - if test_compiler "${nolib_flags[@]}"; then
104 - local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
105 - ewarn "${CC} seems to lack runtime, trying with ${nolib_flags[*]}"
106 - fi
107 - fi
108 -
109 - local mycmakeargs=(
110 - -DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${SLOT}"
111 -
112 - -DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
113 - -DCOMPILER_RT_BUILD_LIBFUZZER=OFF
114 - -DCOMPILER_RT_BUILD_PROFILE=OFF
115 - -DCOMPILER_RT_BUILD_SANITIZERS=OFF
116 - -DCOMPILER_RT_BUILD_XRAY=OFF
117 - )
118 -
119 - if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
120 - mycmakeargs+=(
121 - # disable use of SDK for the system itself
122 - -DDARWIN_macosx_CACHED_SYSROOT=/
123 - )
124 - fi
125 -
126 - if use test; then
127 - mycmakeargs+=(
128 - -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
129 - -DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
130 -
131 - -DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang"
132 - -DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++"
133 - )
134 - fi
135 -
136 - cmake-utils_src_configure
137 -}
138 -
139 -src_test() {
140 - # respect TMPDIR!
141 - local -x LIT_PRESERVES_TMP=1
142 -
143 - cmake-utils_src_make check-builtins
144 -}
145
146 diff --git a/sys-libs/compiler-rt/compiler-rt-10.0.0_rc2.ebuild b/sys-libs/compiler-rt/compiler-rt-10.0.0_rc2.ebuild
147 deleted file mode 100644
148 index 597584d700e..00000000000
149 --- a/sys-libs/compiler-rt/compiler-rt-10.0.0_rc2.ebuild
150 +++ /dev/null
151 @@ -1,110 +0,0 @@
152 -# Copyright 1999-2020 Gentoo Authors
153 -# Distributed under the terms of the GNU General Public License v2
154 -
155 -EAPI=7
156 -
157 -PYTHON_COMPAT=( python3_{6,7,8} )
158 -inherit cmake-utils flag-o-matic llvm llvm.org multiprocessing \
159 - python-any-r1 toolchain-funcs
160 -
161 -DESCRIPTION="Compiler runtime library for clang (built-in part)"
162 -HOMEPAGE="https://llvm.org/"
163 -LLVM_COMPONENTS=( compiler-rt )
164 -llvm.org_set_globals
165 -
166 -LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
167 -SLOT="$(ver_cut 1-3)"
168 -KEYWORDS=""
169 -IUSE="+clang test"
170 -RESTRICT="!test? ( test ) !clang? ( test )"
171 -
172 -CLANG_SLOT=${SLOT%%.*}
173 -# llvm-6 for new lit options
174 -DEPEND="
175 - >=sys-devel/llvm-6"
176 -BDEPEND="
177 - clang? ( sys-devel/clang )
178 - test? (
179 - $(python_gen_any_dep ">=dev-python/lit-9.0.1[\${PYTHON_USEDEP}]")
180 - =sys-devel/clang-${PV%_*}*:${CLANG_SLOT} )
181 - ${PYTHON_DEPS}"
182 -
183 -# least intrusive of all
184 -CMAKE_BUILD_TYPE=RelWithDebInfo
185 -
186 -python_check_deps() {
187 - use test || return 0
188 - has_version "dev-python/lit[${PYTHON_USEDEP}]"
189 -}
190 -
191 -pkg_pretend() {
192 - if ! use clang && ! tc-is-clang; then
193 - ewarn "Building using a compiler other than clang may result in broken atomics"
194 - ewarn "library. Enable USE=clang unless you have a very good reason not to."
195 - fi
196 -}
197 -
198 -pkg_setup() {
199 - llvm_pkg_setup
200 - python-any-r1_pkg_setup
201 -}
202 -
203 -test_compiler() {
204 - $(tc-getCC) ${CFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c - \
205 - <<<'int main() { return 0; }' &>/dev/null
206 -}
207 -
208 -src_configure() {
209 - # pre-set since we need to pass it to cmake
210 - BUILD_DIR=${WORKDIR}/${P}_build
211 -
212 - local nolib_flags=( -nodefaultlibs -lc )
213 - if use clang; then
214 - local -x CC=${CHOST}-clang
215 - local -x CXX=${CHOST}-clang++
216 - strip-unsupported-flags
217 - # ensure we can use clang before installing compiler-rt
218 - local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
219 - elif ! test_compiler; then
220 - if test_compiler "${nolib_flags[@]}"; then
221 - local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
222 - ewarn "${CC} seems to lack runtime, trying with ${nolib_flags[*]}"
223 - fi
224 - fi
225 -
226 - local mycmakeargs=(
227 - -DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${SLOT}"
228 -
229 - -DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
230 - -DCOMPILER_RT_BUILD_LIBFUZZER=OFF
231 - -DCOMPILER_RT_BUILD_PROFILE=OFF
232 - -DCOMPILER_RT_BUILD_SANITIZERS=OFF
233 - -DCOMPILER_RT_BUILD_XRAY=OFF
234 - )
235 -
236 - if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
237 - mycmakeargs+=(
238 - # disable use of SDK for the system itself
239 - -DDARWIN_macosx_CACHED_SYSROOT=/
240 - )
241 - fi
242 -
243 - if use test; then
244 - mycmakeargs+=(
245 - -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
246 - -DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
247 -
248 - -DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang"
249 - -DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++"
250 - )
251 - fi
252 -
253 - cmake-utils_src_configure
254 -}
255 -
256 -src_test() {
257 - # respect TMPDIR!
258 - local -x LIT_PRESERVES_TMP=1
259 -
260 - cmake-utils_src_make check-builtins
261 -}