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, 26 Sep 2022 15:58:21
Message-Id: 1664207847.09b18339f792f5d7d0753c2f8526ff9e8435b0e8.mgorny@gentoo
1 commit: 09b18339f792f5d7d0753c2f8526ff9e8435b0e8
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Mon Sep 26 15:57:27 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Mon Sep 26 15:57:27 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09b18339
7
8 sys-libs/compiler-rt: Remove 16.0.0_pre20220926, it is too broken
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 sys-libs/compiler-rt/Manifest | 1 -
13 .../compiler-rt-16.0.0_pre20220926.ebuild | 151 ---------------------
14 2 files changed, 152 deletions(-)
15
16 diff --git a/sys-libs/compiler-rt/Manifest b/sys-libs/compiler-rt/Manifest
17 index fe6e378eb938..1a118d537cb0 100644
18 --- a/sys-libs/compiler-rt/Manifest
19 +++ b/sys-libs/compiler-rt/Manifest
20 @@ -7,5 +7,4 @@ DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf
21 DIST llvm-project-15.0.1.src.tar.xz 112068688 BLAKE2B 8fd6690445f7cbc8b47a7c1dd1f2c4fbc39f9a97f9d4a0015d466726454b090b0d1ff9b0d926eba7065e84782901687f74e6540a36dc6656a93f3c92c7bc7e06 SHA512 cef84bc173118a30db3ece5e5c6f874bf689c77afc40a4792fdcb7556555ac14a8e6de1dc811755405e5d162d63bc69abaecba30d220a42765160d69f0073fda
22 DIST llvm-project-15.0.1.src.tar.xz.sig 438 BLAKE2B d8f634adab531bb19178fb27bc83b3a90c856e9402dd5af700f9af43813f68d20c21b9112dd95e9f6f10609ee51ed5aaf77edb96ca16fb93136b8aea432affd3 SHA512 cbf2570840d8dc12f6436c495a23cf9d439ee195755c01a6d1d5bcc20133599dc956dc43a0f5016698e3c9a960826f5f3c2840a73f993467e275856a67999fda
23 DIST llvm-project-303526ef3aa211c1930be2885deae15eeeda3b18.tar.gz 167503164 BLAKE2B 143c72c58517b3e40ee74c1a0df47bfd0d0f9e71926bc8c39a007e674a08df95d0ffe05f523f97e4409b248349e13719cabbc7ac6938feebe702959e84a07243 SHA512 9aa5c86de6c6be1d26c085eb29ea283429e41330e937e5fdbd545bb3f5b996ac82cd6268701fcbbd202e89ee35f2b67e595fc595bb7383778e9ad5fd52ca10a0
24 -DIST llvm-project-4f188ef89ce5a3bee21fd0b4e8fcdf7f030f64b2.tar.gz 168720595 BLAKE2B 10bd3ac4eea674fc171f17414f6892a681529b020a5d513e075920f7792fb31d6d4a3584679ebea24bc839c2a233459b935d368c7ea57c94ad27c7c81da05cff SHA512 77ae7eb57c8c50affb516581dabe3b31e342f7ed899440521b6738aeec3b6e795c50c078bbe0f483a070961c9b5b73a7bbe28e2f109e2ce69d238ddbda8e134f
25 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
26
27 diff --git a/sys-libs/compiler-rt/compiler-rt-16.0.0_pre20220926.ebuild b/sys-libs/compiler-rt/compiler-rt-16.0.0_pre20220926.ebuild
28 deleted file mode 100644
29 index 236d4a319ccf..000000000000
30 --- a/sys-libs/compiler-rt/compiler-rt-16.0.0_pre20220926.ebuild
31 +++ /dev/null
32 @@ -1,151 +0,0 @@
33 -# Copyright 1999-2022 Gentoo Authors
34 -# Distributed under the terms of the GNU General Public License v2
35 -
36 -EAPI=8
37 -
38 -PYTHON_COMPAT=( python3_{8..11} )
39 -inherit cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
40 -
41 -DESCRIPTION="Compiler runtime library for clang (built-in part)"
42 -HOMEPAGE="https://llvm.org/"
43 -
44 -LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
45 -SLOT="$(ver_cut 1-3)"
46 -KEYWORDS=""
47 -IUSE="+abi_x86_32 abi_x86_64 +clang debug test"
48 -RESTRICT="!test? ( test ) !clang? ( test )"
49 -
50 -LLVM_MAX_SLOT=${SLOT%%.*}
51 -DEPEND="
52 - sys-devel/llvm:${LLVM_MAX_SLOT}
53 -"
54 -BDEPEND="
55 - >=dev-util/cmake-3.16
56 - clang? ( sys-devel/clang )
57 - test? (
58 - $(python_gen_any_dep ">=dev-python/lit-15[\${PYTHON_USEDEP}]")
59 - =sys-devel/clang-${PV%_*}*:${LLVM_MAX_SLOT}
60 - )
61 - !test? (
62 - ${PYTHON_DEPS}
63 - )
64 -"
65 -
66 -LLVM_COMPONENTS=( compiler-rt cmake llvm/cmake )
67 -LLVM_PATCHSET=9999-1
68 -llvm.org_set_globals
69 -
70 -python_check_deps() {
71 - use test || return 0
72 - python_has_version ">=dev-python/lit-15[${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 - # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
99 - use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
100 -
101 - # pre-set since we need to pass it to cmake
102 - BUILD_DIR=${WORKDIR}/${P}_build
103 -
104 - if use clang; then
105 - # Only do this conditionally to allow overriding with
106 - # e.g. CC=clang-13 in case of breakage
107 - if ! tc-is-clang ; then
108 - local -x CC=${CHOST}-clang
109 - local -x CXX=${CHOST}-clang++
110 - fi
111 -
112 - strip-unsupported-flags
113 - fi
114 -
115 - if ! test_compiler; then
116 - local nolib_flags=( -nodefaultlibs -lc )
117 -
118 - if test_compiler "${nolib_flags[@]}"; then
119 - local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
120 - ewarn "${CC} seems to lack runtime, trying with ${nolib_flags[*]}"
121 - elif test_compiler "${nolib_flags[@]}" -nostartfiles; then
122 - # Avoiding -nostartfiles earlier on for bug #862540,
123 - # and set available entry symbol for bug #862798.
124 - nolib_flags+=( -nostartfiles -emain )
125 -
126 - local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
127 - ewarn "${CC} seems to lack runtime, trying with ${nolib_flags[*]}"
128 - fi
129 - fi
130 -
131 - local mycmakeargs=(
132 - -DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${SLOT}"
133 -
134 - -DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
135 - -DCOMPILER_RT_BUILD_LIBFUZZER=OFF
136 - -DCOMPILER_RT_BUILD_MEMPROF=OFF
137 - -DCOMPILER_RT_BUILD_ORC=OFF
138 - -DCOMPILER_RT_BUILD_PROFILE=OFF
139 - -DCOMPILER_RT_BUILD_SANITIZERS=OFF
140 - -DCOMPILER_RT_BUILD_XRAY=OFF
141 -
142 - -DPython3_EXECUTABLE="${PYTHON}"
143 - )
144 -
145 - if use amd64; then
146 - mycmakeargs+=(
147 - -DCAN_TARGET_i386=$(usex abi_x86_32)
148 - -DCAN_TARGET_x86_64=$(usex abi_x86_64)
149 - )
150 - fi
151 -
152 - if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
153 - mycmakeargs+=(
154 - # setting -isysroot is disabled with compiler-rt-prefix-paths.patch
155 - # this allows adding arm64 support using SDK in EPREFIX
156 - -DDARWIN_macosx_CACHED_SYSROOT="${EPREFIX}/MacOSX.sdk"
157 - # Set version based on the SDK in EPREFIX.
158 - # This disables i386 for SDK >= 10.15
159 - -DDARWIN_macosx_OVERRIDE_SDK_VERSION="$(realpath ${EPREFIX}/MacOSX.sdk | sed -e 's/.*MacOSX\(.*\)\.sdk/\1/')"
160 - # Use our libtool instead of looking it up with xcrun
161 - -DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool"
162 - )
163 - fi
164 -
165 - if use test; then
166 - mycmakeargs+=(
167 - -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
168 - -DLLVM_LIT_ARGS="$(get_lit_flags)"
169 -
170 - -DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang"
171 - -DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++"
172 - )
173 - fi
174 -
175 - cmake_src_configure
176 -}
177 -
178 -src_test() {
179 - # respect TMPDIR!
180 - local -x LIT_PRESERVES_TMP=1
181 -
182 - cmake_build check-builtins
183 -}