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: Mon, 17 May 2021 06:49:58
Message-Id: 1621234162.3a4d729554dbecff992544f5b677d7b4be737d54.mgorny@gentoo
1 commit: 3a4d729554dbecff992544f5b677d7b4be737d54
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sun May 16 20:26:37 2021 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Mon May 17 06:49:22 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a4d7295
7
8 sys-libs/compiler-rt: Remove 11.0.0
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-11.0.0.ebuild | 121 -------------------------
14 2 files changed, 123 deletions(-)
15
16 diff --git a/sys-libs/compiler-rt/Manifest b/sys-libs/compiler-rt/Manifest
17 index 88b3c48b1f1..4e0f31a4b81 100644
18 --- a/sys-libs/compiler-rt/Manifest
19 +++ b/sys-libs/compiler-rt/Manifest
20 @@ -1,10 +1,8 @@
21 DIST llvm-gentoo-patchset-10.0.1-1.tar.xz 8320 BLAKE2B 1b7ea7669586e08fece0efcf02b392feed4b7f3e6e9cdd10ab7dcc30082cae5bb1daa6d3314a7b0329c4d70f3c736d0c57ed408c838601dc737d558d2a0a0f26 SHA512 75898a8d719657177bbf587d848be8e53135c09e50603660c19edab00f80b6c2f29e7b6fda2bef381b38df6e24a690d694029a38c525763408322573275fc9f0
22 -DIST llvm-gentoo-patchset-11.0.0-1.tar.xz 6100 BLAKE2B 6f8fc9b7daa703f04b1283caaeb3665d4bec56ff80b1c5db35917c578fdd92617222bd2d2b83020144b8abdeaa261142b68aa3dee24350133f6721e41a167b78 SHA512 debdd92e6aa3133f474dfbd79f267e76d9d979e4e5d464c8d4343c6e6816b46376ca8080a9ee916152861907af9d0645ce71cf3582ef3dc31ec4ca3410fde9f6
23 DIST llvm-gentoo-patchset-11.1.0-1.tar.xz 4032 BLAKE2B e69138a422e315b31a3d9c11faa4ae1ddf1bf9092cee2db0de4d2adef81fd802973488293aab48b764402b51996893b17ca03249ef4620848a576d1f6cdb9698 SHA512 e1c5504dab6c5db9fdf4addfeb12316f22d0258717ba551a9b7b3ba37919491fb6011ac5cca1e793b7509d5c1c186bc6bc4213f7d6155d190612492b216f979b
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/compiler-rt-11.0.0.ebuild b/sys-libs/compiler-rt/compiler-rt-11.0.0.ebuild
33 deleted file mode 100644
34 index dce4982904c..00000000000
35 --- a/sys-libs/compiler-rt/compiler-rt-11.0.0.ebuild
36 +++ /dev/null
37 @@ -1,121 +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 cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
45 -
46 -DESCRIPTION="Compiler runtime library for clang (built-in part)"
47 -HOMEPAGE="https://llvm.org/"
48 -LLVM_COMPONENTS=( compiler-rt )
49 -LLVM_PATCHSET=11.0.0-1
50 -llvm.org_set_globals
51 -
52 -LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
53 -SLOT="$(ver_cut 1-3)"
54 -KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86 ~amd64-linux ~ppc-macos ~x64-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 -BDEPEND="
63 - >=dev-util/cmake-3.16
64 - clang? ( sys-devel/clang )
65 - test? (
66 - $(python_gen_any_dep ">=dev-python/lit-9.0.1[\${PYTHON_USEDEP}]")
67 - =sys-devel/clang-${PV%_*}*:${CLANG_SLOT} )
68 - ${PYTHON_DEPS}"
69 -
70 -python_check_deps() {
71 - use test || return 0
72 - has_version "dev-python/lit[${PYTHON_USEDEP}]"
73 -}
74 -
75 -pkg_pretend() {
76 - if ! use clang && ! tc-is-clang; then
77 - ewarn "Building using a compiler other than clang may result in broken atomics"
78 - ewarn "library. Enable USE=clang unless you have a very good reason not to."
79 - fi
80 -}
81 -
82 -pkg_setup() {
83 - # Darwin Prefix builds do not have llvm installed yet, so rely on
84 - # bootstrap-prefix to set the appropriate path vars to LLVM instead
85 - # of using llvm_pkg_setup.
86 - if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then
87 - llvm_pkg_setup
88 - fi
89 - python-any-r1_pkg_setup
90 -}
91 -
92 -test_compiler() {
93 - $(tc-getCC) ${CFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c - \
94 - <<<'int main() { return 0; }' &>/dev/null
95 -}
96 -
97 -src_configure() {
98 - # pre-set since we need to pass it to cmake
99 - BUILD_DIR=${WORKDIR}/${P}_build
100 -
101 - local nolib_flags=( -nodefaultlibs -lc )
102 - if use clang; then
103 - local -x CC=${CHOST}-clang
104 - local -x CXX=${CHOST}-clang++
105 - strip-unsupported-flags
106 - # ensure we can use clang before installing compiler-rt
107 - local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
108 - elif ! test_compiler; then
109 - if test_compiler "${nolib_flags[@]}"; then
110 - local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
111 - ewarn "${CC} seems to lack runtime, trying with ${nolib_flags[*]}"
112 - fi
113 - fi
114 -
115 - local mycmakeargs=(
116 - -DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${SLOT}"
117 -
118 - -DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
119 - -DCOMPILER_RT_BUILD_LIBFUZZER=OFF
120 - -DCOMPILER_RT_BUILD_PROFILE=OFF
121 - -DCOMPILER_RT_BUILD_SANITIZERS=OFF
122 - -DCOMPILER_RT_BUILD_XRAY=OFF
123 -
124 - -DPython3_EXECUTABLE="${PYTHON}"
125 - )
126 -
127 - if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
128 - mycmakeargs+=(
129 - # setting -isysroot is disabled with compiler-rt-prefix-paths.patch
130 - # this allows adding arm64 support using SDK in EPREFIX
131 - -DDARWIN_macosx_CACHED_SYSROOT="${EPREFIX}/MacOSX.sdk"
132 - # Set version based on the SDK in EPREFIX.
133 - # This disables i386 for SDK >= 10.15
134 - -DDARWIN_macosx_OVERRIDE_SDK_VERSION="$(realpath ${EPREFIX}/MacOSX.sdk | sed -e 's/.*MacOSX\(.*\)\.sdk/\1/')"
135 - # Use our libtool instead of looking it up with xcrun
136 - -DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool"
137 - )
138 - fi
139 -
140 - if use test; then
141 - mycmakeargs+=(
142 - -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
143 - -DLLVM_LIT_ARGS="$(get_lit_flags)"
144 -
145 - -DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang"
146 - -DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++"
147 - )
148 - fi
149 -
150 - cmake_src_configure
151 -}
152 -
153 -src_test() {
154 - # respect TMPDIR!
155 - local -x LIT_PRESERVES_TMP=1
156 -
157 - cmake_build check-builtins
158 -}