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