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, 13 Mar 2019 08:22:30
Message-Id: 1552463397.d140d51e2cd118fa8e4e0ec73232ee26f7a2ec0d.mgorny@gentoo
1 commit: d140d51e2cd118fa8e4e0ec73232ee26f7a2ec0d
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed Mar 13 07:49:57 2019 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed Mar 13 07:49:57 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d140d51e
7
8 sys-libs/compiler-rt: Remove 8.0.0rc[23]
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-8.0.0_rc2.ebuild | 109 ----------------------
14 sys-libs/compiler-rt/compiler-rt-8.0.0_rc3.ebuild | 109 ----------------------
15 3 files changed, 220 deletions(-)
16
17 diff --git a/sys-libs/compiler-rt/Manifest b/sys-libs/compiler-rt/Manifest
18 index 3d4faccdad9..8c7f5924bd7 100644
19 --- a/sys-libs/compiler-rt/Manifest
20 +++ b/sys-libs/compiler-rt/Manifest
21 @@ -2,6 +2,4 @@ DIST compiler-rt-4.0.1.src.tar.xz 1434100 BLAKE2B ca6bf78fc07f387b7244a52ef648b0
22 DIST compiler-rt-5.0.2.src.tar.xz 1543256 BLAKE2B 09fa84b8f3e9b8627a14387bc6eaa3d6b4588b9c8f1ac5a0114135fd830e3d45922408b237866789eb81bf38defde1186e0f7430a69f825bee12776b7cd9f74e SHA512 605a6d064877a860d6c9097e0220896dfceafed0a2392ad495c97aa347b97899d89f7e21932e29d3274f396615837414a3e730a915fe4f53eaa858ce3642a666
23 DIST compiler-rt-6.0.1.src.tar.xz 1686820 BLAKE2B 59fa3f6e478bd4d6dfa056c85dcdc4349cbce7cea7fc56519feddc9d66c88c9ca48bad7967432ceb81d754213577f12707035afd827cf630a58627575b73b798 SHA512 69850c1ad92c66977fa217cbfb42a6a3f502fbe3d1a08daa7fc4cfeb617a7736d231f8ad8d93b10b1ae29bd753315d2a2d70f9ff1f4d18a9a7cc81758d91f963
24 DIST compiler-rt-7.0.1.src.tar.xz 1864520 BLAKE2B 14f72aad4379387f4212fb5efef3456cb5e8a03c7a91f98de2368e9b5ff2d02aeaed05da4fba6978b9e4e8698eb34c9c0c4c2df8d43b8c11e8e9d65079c7fa41 SHA512 b94a2a1fb9a6d587cef59b04b951628747bb35bdbcb67de8825aad402a2ba875916a347eef7a9575ac27264e8372e2d67cd477fe2d750c0ed3ce7d67bbbc7dba
25 -DIST compiler-rt-8.0.0rc2.src.tar.xz 1902996 BLAKE2B e1f0046d130a9214ddf00cdb50e303316b9207eb8df946872992dd28b9fa89505e0c136104d372ea95305c1a9e9ff802cae7781c73bea53ac92378032986689c SHA512 49a34055a27efcee9fca1c0a50fe9061ae09945174a9076f76fce001621a3f8fa177ca0356313087a6d2b949d1d5149714036e89790868b984949721ce646685
26 -DIST compiler-rt-8.0.0rc3.src.tar.xz 1904692 BLAKE2B 94faa29c6fc963da2cec5196547bf9814d94d4be45efdb0c057744b51055a8c0ab871cfab13bb21567f614d8da461398f35f8a7cf75475b925ffc4b2787f1683 SHA512 b40c4cae673c45763e722f32faf2db810591b92b1eb7ca46214f3686c2c96106d3eb4962f6ed4d340666502216994589269661f2169fc8f7044f0423d22c380f
27 DIST compiler-rt-8.0.0rc5.src.tar.xz 1902880 BLAKE2B ef8a3eeb58845032f332cc3e0eed4ca33166450ef0ebf21d00fa6f0068ff61a3af54bddb696c9ab507c909baa5bf53ad1bc218ca5a3a354a021315fd6ad1b6b5 SHA512 6d7e520e2b16e097b35fcfce1637160ce8b3a174ef79b7c56e4fae466aef9dafc45f577de590426637f9950bbb2f0c18213cea90e566b05f4f6251e4e5de0dca
28
29 diff --git a/sys-libs/compiler-rt/compiler-rt-8.0.0_rc2.ebuild b/sys-libs/compiler-rt/compiler-rt-8.0.0_rc2.ebuild
30 deleted file mode 100644
31 index 42b690e9883..00000000000
32 --- a/sys-libs/compiler-rt/compiler-rt-8.0.0_rc2.ebuild
33 +++ /dev/null
34 @@ -1,109 +0,0 @@
35 -# Copyright 1999-2019 Gentoo Authors
36 -# Distributed under the terms of the GNU General Public License v2
37 -
38 -EAPI=6
39 -
40 -: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
41 -# (needed due to CMAKE_BUILD_TYPE != Gentoo)
42 -CMAKE_MIN_VERSION=3.7.0-r1
43 -PYTHON_COMPAT=( python2_7 )
44 -
45 -inherit cmake-utils flag-o-matic llvm multiprocessing \
46 - python-any-r1 toolchain-funcs
47 -
48 -DESCRIPTION="Compiler runtime library for clang (built-in part)"
49 -HOMEPAGE="https://llvm.org/"
50 -SRC_URI="https://prereleases.llvm.org/${PV/_//}/${P/_/}.src.tar.xz"
51 -
52 -LICENSE="|| ( UoI-NCSA MIT )"
53 -SLOT="${PV%_*}"
54 -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
55 -IUSE="+clang test"
56 -RESTRICT="!test? ( test ) !clang? ( test )"
57 -
58 -CLANG_SLOT=${SLOT%%.*}
59 -# llvm-6 for new lit options
60 -DEPEND="
61 - >=sys-devel/llvm-6
62 - clang? ( sys-devel/clang )
63 - test? (
64 - $(python_gen_any_dep "dev-python/lit[\${PYTHON_USEDEP}]")
65 - =sys-devel/clang-${PV%_*}*:${CLANG_SLOT} )
66 - ${PYTHON_DEPS}"
67 -
68 -S=${WORKDIR}/${P/_/}.src
69 -
70 -# least intrusive of all
71 -CMAKE_BUILD_TYPE=RelWithDebInfo
72 -
73 -pkg_pretend() {
74 - if ! use clang && ! tc-is-clang; then
75 - ewarn "Building using a compiler other than clang may result in broken atomics"
76 - ewarn "library. Enable USE=clang unless you have a very good reason not to."
77 - fi
78 -}
79 -
80 -pkg_setup() {
81 - llvm_pkg_setup
82 - python-any-r1_pkg_setup
83 -}
84 -
85 -test_compiler() {
86 - $(tc-getCC) ${CFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c - \
87 - <<<'int main() { return 0; }' &>/dev/null
88 -}
89 -
90 -src_configure() {
91 - # pre-set since we need to pass it to cmake
92 - BUILD_DIR=${WORKDIR}/${P}_build
93 -
94 - local nolib_flags=( -nodefaultlibs -lc )
95 - if use clang; then
96 - local -x CC=${CHOST}-clang
97 - local -x CXX=${CHOST}-clang++
98 - # ensure we can use clang before installing compiler-rt
99 - local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
100 - strip-unsupported-flags
101 - elif ! test_compiler; then
102 - if test_compiler "${nolib_flags[@]}"; then
103 - local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
104 - ewarn "${CC} seems to lack runtime, trying with ${nolib_flags[*]}"
105 - fi
106 - fi
107 -
108 - local mycmakeargs=(
109 - -DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${SLOT}"
110 -
111 - -DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
112 - -DCOMPILER_RT_BUILD_LIBFUZZER=OFF
113 - -DCOMPILER_RT_BUILD_PROFILE=OFF
114 - -DCOMPILER_RT_BUILD_SANITIZERS=OFF
115 - -DCOMPILER_RT_BUILD_XRAY=OFF
116 - )
117 -
118 - if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
119 - mycmakeargs+=(
120 - # disable use of SDK for the system itself
121 - -DDARWIN_macosx_CACHED_SYSROOT=/
122 - )
123 - fi
124 -
125 - if use test; then
126 - mycmakeargs+=(
127 - -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
128 - -DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
129 -
130 - -DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang"
131 - -DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++"
132 - )
133 - fi
134 -
135 - cmake-utils_src_configure
136 -}
137 -
138 -src_test() {
139 - # respect TMPDIR!
140 - local -x LIT_PRESERVES_TMP=1
141 -
142 - cmake-utils_src_make check-builtins
143 -}
144
145 diff --git a/sys-libs/compiler-rt/compiler-rt-8.0.0_rc3.ebuild b/sys-libs/compiler-rt/compiler-rt-8.0.0_rc3.ebuild
146 deleted file mode 100644
147 index 42b690e9883..00000000000
148 --- a/sys-libs/compiler-rt/compiler-rt-8.0.0_rc3.ebuild
149 +++ /dev/null
150 @@ -1,109 +0,0 @@
151 -# Copyright 1999-2019 Gentoo Authors
152 -# Distributed under the terms of the GNU General Public License v2
153 -
154 -EAPI=6
155 -
156 -: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
157 -# (needed due to CMAKE_BUILD_TYPE != Gentoo)
158 -CMAKE_MIN_VERSION=3.7.0-r1
159 -PYTHON_COMPAT=( python2_7 )
160 -
161 -inherit cmake-utils flag-o-matic llvm multiprocessing \
162 - python-any-r1 toolchain-funcs
163 -
164 -DESCRIPTION="Compiler runtime library for clang (built-in part)"
165 -HOMEPAGE="https://llvm.org/"
166 -SRC_URI="https://prereleases.llvm.org/${PV/_//}/${P/_/}.src.tar.xz"
167 -
168 -LICENSE="|| ( UoI-NCSA MIT )"
169 -SLOT="${PV%_*}"
170 -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
171 -IUSE="+clang test"
172 -RESTRICT="!test? ( test ) !clang? ( test )"
173 -
174 -CLANG_SLOT=${SLOT%%.*}
175 -# llvm-6 for new lit options
176 -DEPEND="
177 - >=sys-devel/llvm-6
178 - clang? ( sys-devel/clang )
179 - test? (
180 - $(python_gen_any_dep "dev-python/lit[\${PYTHON_USEDEP}]")
181 - =sys-devel/clang-${PV%_*}*:${CLANG_SLOT} )
182 - ${PYTHON_DEPS}"
183 -
184 -S=${WORKDIR}/${P/_/}.src
185 -
186 -# least intrusive of all
187 -CMAKE_BUILD_TYPE=RelWithDebInfo
188 -
189 -pkg_pretend() {
190 - if ! use clang && ! tc-is-clang; then
191 - ewarn "Building using a compiler other than clang may result in broken atomics"
192 - ewarn "library. Enable USE=clang unless you have a very good reason not to."
193 - fi
194 -}
195 -
196 -pkg_setup() {
197 - llvm_pkg_setup
198 - python-any-r1_pkg_setup
199 -}
200 -
201 -test_compiler() {
202 - $(tc-getCC) ${CFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c - \
203 - <<<'int main() { return 0; }' &>/dev/null
204 -}
205 -
206 -src_configure() {
207 - # pre-set since we need to pass it to cmake
208 - BUILD_DIR=${WORKDIR}/${P}_build
209 -
210 - local nolib_flags=( -nodefaultlibs -lc )
211 - if use clang; then
212 - local -x CC=${CHOST}-clang
213 - local -x CXX=${CHOST}-clang++
214 - # ensure we can use clang before installing compiler-rt
215 - local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
216 - strip-unsupported-flags
217 - elif ! test_compiler; then
218 - if test_compiler "${nolib_flags[@]}"; then
219 - local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
220 - ewarn "${CC} seems to lack runtime, trying with ${nolib_flags[*]}"
221 - fi
222 - fi
223 -
224 - local mycmakeargs=(
225 - -DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${SLOT}"
226 -
227 - -DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
228 - -DCOMPILER_RT_BUILD_LIBFUZZER=OFF
229 - -DCOMPILER_RT_BUILD_PROFILE=OFF
230 - -DCOMPILER_RT_BUILD_SANITIZERS=OFF
231 - -DCOMPILER_RT_BUILD_XRAY=OFF
232 - )
233 -
234 - if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
235 - mycmakeargs+=(
236 - # disable use of SDK for the system itself
237 - -DDARWIN_macosx_CACHED_SYSROOT=/
238 - )
239 - fi
240 -
241 - if use test; then
242 - mycmakeargs+=(
243 - -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
244 - -DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
245 -
246 - -DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang"
247 - -DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++"
248 - )
249 - fi
250 -
251 - cmake-utils_src_configure
252 -}
253 -
254 -src_test() {
255 - # respect TMPDIR!
256 - local -x LIT_PRESERVES_TMP=1
257 -
258 - cmake-utils_src_make check-builtins
259 -}