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: Sat, 11 Sep 2021 07:24:23
Message-Id: 1631344653.d12446c53de78afc498329e34a8b3ed17a2219fc.mgorny@gentoo
1 commit: d12446c53de78afc498329e34a8b3ed17a2219fc
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sat Sep 11 07:17:05 2021 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sat Sep 11 07:17:33 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d12446c5
7
8 sys-libs/compiler-rt: Remove 12.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-12.0.0.ebuild | 124 -------------------------
14 2 files changed, 126 deletions(-)
15
16 diff --git a/sys-libs/compiler-rt/Manifest b/sys-libs/compiler-rt/Manifest
17 index 695175197b3..c24e85c1763 100644
18 --- a/sys-libs/compiler-rt/Manifest
19 +++ b/sys-libs/compiler-rt/Manifest
20 @@ -1,12 +1,10 @@
21 DIST llvm-gentoo-patchset-10.0.1-1.tar.xz 8320 BLAKE2B 1b7ea7669586e08fece0efcf02b392feed4b7f3e6e9cdd10ab7dcc30082cae5bb1daa6d3314a7b0329c4d70f3c736d0c57ed408c838601dc737d558d2a0a0f26 SHA512 75898a8d719657177bbf587d848be8e53135c09e50603660c19edab00f80b6c2f29e7b6fda2bef381b38df6e24a690d694029a38c525763408322573275fc9f0
22 DIST llvm-gentoo-patchset-11.1.0-1.tar.xz 4032 BLAKE2B e69138a422e315b31a3d9c11faa4ae1ddf1bf9092cee2db0de4d2adef81fd802973488293aab48b764402b51996893b17ca03249ef4620848a576d1f6cdb9698 SHA512 e1c5504dab6c5db9fdf4addfeb12316f22d0258717ba551a9b7b3ba37919491fb6011ac5cca1e793b7509d5c1c186bc6bc4213f7d6155d190612492b216f979b
23 -DIST llvm-gentoo-patchset-12.0.0-1.tar.xz 6364 BLAKE2B bcf96dad8300cdc3e1f416cb90935ae3b1359efc5687118b5a9bbee25de7087a266250f50c6f2abd18f4efeeec19354f59513c8fdd1d61c2cfc8cc2f0115e514 SHA512 76201e169f71a8d568365ffeafcfd37138e74b0536826f47eb6ce89c2280586f10426917e851f99bfb20477cd828cc40daa8cb7a62959981620fbd81e1b22ee1
24 DIST llvm-gentoo-patchset-12.0.1.tar.xz 5280 BLAKE2B 963d005bc7b636570be90eb841ac5bcaeb927538cc7de27683167111a17d6496677c7517de2ecfaf14b5d8ac22bad357be490b8a2ed9aba502fd5f447ecc99e9 SHA512 fc7c38e671555751650299c3a8bee44d5c7f26e11b68d5538c507fb7fe9ff2d349bdcd43bce90a448a747f082d523b3849d6bcda5e3ae2e998edcb926d6aa249
25 DIST llvm-gentoo-patchset-13.0.0-rc2.tar.xz 5556 BLAKE2B e6c7ecfe8f842edc4d4f30a20c66973519182ecb46e21fb20b6c5fcb6d54cdef830fcb120a405b77f1332e3557acbbbbfa99170b20d17f137e0a63b2d0dc1258 SHA512 ddeaf1d07f0ba893ce93e5fe1eff1c0716769a7879fc503c397f4db7becb363f94747f59b6d53c204df73a93954fb0ca5aae6ad544ce55c964c4bf441a410cd2
26 DIST llvm-gentoo-patchset-9999-1.tar.xz 4032 BLAKE2B b9413484dafed8ae0c68c2c164b45fd07bb8d5d0898f03abe118fd2120ffcb1fb6c949de9649a97c2e8105f24b9d131a725c67c0a502ca4d4d192c1a0d65f49d SHA512 e64449eeaf756c5bd945109937b84ba4bd8a015222bd792d39cf3947871e87571a4ca57814790e51544cb05ad4c2d1f044e818e4caaac7c2e2a02cb1aa290fcc
27 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
28 DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
29 -DIST llvmorg-12.0.0.tar.gz 134226215 BLAKE2B f9c3ba8c58571855caa4f206fd285c9b5be66672fb0814cb8bc0964a051f57f5d35013aa1e27cbda502652b37df1ec23474129109e76a42066847860db441dbe SHA512 0cff02155c5ac0d6db2b72d60d9819d5b5dd859663b45f721b1c7540239c2fceb1f57d9173f6870c49de851c242ed8e85c5c6d6577a1f8092a7c5dcd12513b26
30 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
31 DIST llvmorg-13.0.0-rc1.tar.gz 147235597 BLAKE2B 089fed119dee8a16f278cebb13808bd5a95629cc87ebee3050225cc041b78fee51acacc5bcc913d4a99e830bfe5774b19a04a845293c5087dd2a8c9d94d2fde9 SHA512 6e307e2c2dcb7ff41d11ee29d69f41c0ef55f200999847a3a924a2e773fc9c2160015746789af8b723c628bd232f97fce63370209bd0065491d80b0cc0017e85
32 DIST llvmorg-13.0.0-rc2.tar.gz 147267736 BLAKE2B 153bf7320f2aa911112d366ffc79f7110cb04f135c2a8b176c263f0a75eb768206d9bd462893d45504b0e58aa9e127fdcafb02300eab1666e4616aa654d457dd SHA512 a01baf3eaa02f02af42bfcf6dcf24f166351bf1c09601495617c81e41def23210573bad40a344270f40c5deb881d06863536abac2a6481930766a6a56335fb44
33
34 diff --git a/sys-libs/compiler-rt/compiler-rt-12.0.0.ebuild b/sys-libs/compiler-rt/compiler-rt-12.0.0.ebuild
35 deleted file mode 100644
36 index 3f0084940e5..00000000000
37 --- a/sys-libs/compiler-rt/compiler-rt-12.0.0.ebuild
38 +++ /dev/null
39 @@ -1,124 +0,0 @@
40 -# Copyright 1999-2021 Gentoo Authors
41 -# Distributed under the terms of the GNU General Public License v2
42 -
43 -EAPI=7
44 -
45 -PYTHON_COMPAT=( python3_{7..9} )
46 -inherit cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
47 -
48 -DESCRIPTION="Compiler runtime library for clang (built-in part)"
49 -HOMEPAGE="https://llvm.org/"
50 -
51 -LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
52 -SLOT="$(ver_cut 1-3)"
53 -KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86 ~amd64-linux ~ppc-macos ~x64-macos"
54 -IUSE="+clang test"
55 -RESTRICT="!test? ( test ) !clang? ( test )"
56 -
57 -CLANG_SLOT=${SLOT%%.*}
58 -# llvm-6 for new lit options
59 -DEPEND="
60 - >=sys-devel/llvm-6"
61 -BDEPEND="
62 - >=dev-util/cmake-3.16
63 - clang? ( sys-devel/clang )
64 - test? (
65 - $(python_gen_any_dep ">=dev-python/lit-9.0.1[\${PYTHON_USEDEP}]")
66 - =sys-devel/clang-${PV%_*}*:${CLANG_SLOT}
67 - )
68 - ${PYTHON_DEPS}"
69 -
70 -LLVM_COMPONENTS=( compiler-rt )
71 -LLVM_PATCHSET=12.0.0-1
72 -llvm.org_set_globals
73 -
74 -python_check_deps() {
75 - use test || return 0
76 - has_version "dev-python/lit[${PYTHON_USEDEP}]"
77 -}
78 -
79 -pkg_pretend() {
80 - if ! use clang && ! tc-is-clang; then
81 - ewarn "Building using a compiler other than clang may result in broken atomics"
82 - ewarn "library. Enable USE=clang unless you have a very good reason not to."
83 - fi
84 -}
85 -
86 -pkg_setup() {
87 - # Darwin Prefix builds do not have llvm installed yet, so rely on
88 - # bootstrap-prefix to set the appropriate path vars to LLVM instead
89 - # of using llvm_pkg_setup.
90 - if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then
91 - llvm_pkg_setup
92 - fi
93 - python-any-r1_pkg_setup
94 -}
95 -
96 -test_compiler() {
97 - $(tc-getCC) ${CFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c - \
98 - <<<'int main() { return 0; }' &>/dev/null
99 -}
100 -
101 -src_configure() {
102 - # pre-set since we need to pass it to cmake
103 - BUILD_DIR=${WORKDIR}/${P}_build
104 -
105 - local nolib_flags=( -nodefaultlibs -lc )
106 - if use clang; then
107 - local -x CC=${CHOST}-clang
108 - local -x CXX=${CHOST}-clang++
109 - strip-unsupported-flags
110 - # ensure we can use clang before installing compiler-rt
111 - local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
112 - elif ! test_compiler; then
113 - if test_compiler "${nolib_flags[@]}"; then
114 - local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
115 - ewarn "${CC} seems to lack runtime, trying with ${nolib_flags[*]}"
116 - fi
117 - fi
118 -
119 - local mycmakeargs=(
120 - -DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${SLOT}"
121 -
122 - -DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
123 - -DCOMPILER_RT_BUILD_LIBFUZZER=OFF
124 - -DCOMPILER_RT_BUILD_MEMPROF=OFF
125 - -DCOMPILER_RT_BUILD_PROFILE=OFF
126 - -DCOMPILER_RT_BUILD_SANITIZERS=OFF
127 - -DCOMPILER_RT_BUILD_XRAY=OFF
128 -
129 - -DPython3_EXECUTABLE="${PYTHON}"
130 - )
131 -
132 - if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
133 - mycmakeargs+=(
134 - # setting -isysroot is disabled with compiler-rt-prefix-paths.patch
135 - # this allows adding arm64 support using SDK in EPREFIX
136 - -DDARWIN_macosx_CACHED_SYSROOT="${EPREFIX}/MacOSX.sdk"
137 - # Set version based on the SDK in EPREFIX.
138 - # This disables i386 for SDK >= 10.15
139 - -DDARWIN_macosx_OVERRIDE_SDK_VERSION="$(realpath ${EPREFIX}/MacOSX.sdk | sed -e 's/.*MacOSX\(.*\)\.sdk/\1/')"
140 - # Use our libtool instead of looking it up with xcrun
141 - -DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool"
142 - )
143 - fi
144 -
145 - if use test; then
146 - mycmakeargs+=(
147 - -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
148 - -DLLVM_LIT_ARGS="$(get_lit_flags)"
149 -
150 - -DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang"
151 - -DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++"
152 - )
153 - fi
154 -
155 - cmake_src_configure
156 -}
157 -
158 -src_test() {
159 - # respect TMPDIR!
160 - local -x LIT_PRESERVES_TMP=1
161 -
162 - cmake_build check-builtins
163 -}