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: Thu, 03 Nov 2022 14:51:02
Message-Id: 1667486995.e042df1ead67540958516392dd165bdbf77f8713.mgorny@gentoo
1 commit: e042df1ead67540958516392dd165bdbf77f8713
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed Nov 2 19:55:15 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Thu Nov 3 14:49:55 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e042df1e
7
8 sys-libs/compiler-rt: Bump to 15.0.4
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 sys-libs/compiler-rt/Manifest | 3 +
13 sys-libs/compiler-rt/compiler-rt-15.0.4.ebuild | 150 +++++++++++++++++++++++++
14 2 files changed, 153 insertions(+)
15
16 diff --git a/sys-libs/compiler-rt/Manifest b/sys-libs/compiler-rt/Manifest
17 index 7158e5f506a2..44fed785995b 100644
18 --- a/sys-libs/compiler-rt/Manifest
19 +++ b/sys-libs/compiler-rt/Manifest
20 @@ -1,6 +1,7 @@
21 DIST llvm-gentoo-patchset-13.0.1.tar.xz 6288 BLAKE2B 899222b962486e924e4f8a2b574d285531a3f87af9385ff68c81db92aa224a0cde6d4ee049b5405056bedb4b232b50e1d5840024071a4a215f6311853304c92d SHA512 b2805337f1deca626768a44c5e7ac9ed16e0c31bead1647d44a493a8123c1b8e8f1c8ceee3536bcc6fa87fdd3fcec408229f701adf30eff07e7ef9889b847b01
22 DIST llvm-gentoo-patchset-14.0.6-r2.tar.xz 16120 BLAKE2B e12e522fdb7ba505693c679cb09cc8e00e6a954df195c86c2af4dbf1b68334a405b8dcc45f2e28b5e5e0b7e9d5eb7ba907337027927371b7a3b7784ff8aae7e0 SHA512 8a5ea71c30fc0727cc855dd812bbcb6d5f51c80c98eb3d5b80258d5c5eaab1310edc9d53ae63c2ca827abec68e2912c4b69ef0da351ff883fb30545a61e1d09c
23 DIST llvm-gentoo-patchset-15.0.3.tar.xz 17480 BLAKE2B d540b044ad0a0505ebf69f732c71fbce281cfc13ee599ba1289238b673a4ba9a4196e80d63fec99db82e55bf6f036fbb9ca0ba489169c2a732f0d1aa2e96ae5a SHA512 f877d5be3e38d64cccc2c8a47287562a42d07f84c7d1b466ae2161aed3f2797bebedaf1118623ae3ded2b47d6abc0ca29ba7a387c07b6097389e715a50cc3816
24 +DIST llvm-gentoo-patchset-15.0.4.tar.xz 16972 BLAKE2B 39cf8a7112d05e50bab8fd54b7559b5bbb4698d9c1adf97f9b4ef93b37d1c342a1e6fd0e85633369f049c9cbf930b50debb2e476c9a348c53943378a0f77d892 SHA512 a99a31dd6db384a3a896d101e148acb028c837bbc9c4b0239606fd6ef0f365312721eb6b209747024c264c2a9dcf81ee7f1cd1a9f372a7ac741a2456d8356e62
25 DIST llvm-gentoo-patchset-16.0.0_pre20221023.tar.xz 5876 BLAKE2B 496f2db3dd9b4c8d3a87bb098f0c995124c594a24095abc351ba3f13652ff2ee7a988dfb49652ab7780a5107f16509f56531375ab46f330797b0df562b6541d8 SHA512 518aca413537ce2e1aee8252692bc008e520c94fccc6c1b4a106decd4042cf21bbae95e3520a0c76cb7be81ad7a6a705734117ecaa254725dbc1f597f8ec6172
26 DIST llvm-gentoo-patchset-9999-1.tar.xz 4032 BLAKE2B b9413484dafed8ae0c68c2c164b45fd07bb8d5d0898f03abe118fd2120ffcb1fb6c949de9649a97c2e8105f24b9d131a725c67c0a502ca4d4d192c1a0d65f49d SHA512 e64449eeaf756c5bd945109937b84ba4bd8a015222bd792d39cf3947871e87571a4ca57814790e51544cb05ad4c2d1f044e818e4caaac7c2e2a02cb1aa290fcc
27 DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f15e428f22a536a17e5f4e3eb29a003b8a8ec0abe0fa3e072591161d5f30ef7d8867c1ce34d1b341ad858e93c00263499941a99 SHA512 6fc6eeb60fac698702d1aac495fc0161eb7216a1f8db2020af8fccec5837831f7cc20dc2a169bf4f0b5f520748280b4a86621f3697d622aa58faaa45dbfaad13
28 @@ -8,5 +9,7 @@ DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf
29 DIST llvm-project-14f996dca8a2b5b17d6917528bfd9ee71ba6192a.tar.gz 169054148 BLAKE2B a23af6658a6ea8a7cb4272faef151937da229e39383ec068d7ef81e72a25d2a46dc2a86255a7f1148b7385b339d1c17e62f627df834d8eccc39be8921575f88d SHA512 e719d296016e7af718d022424c337a5df8d7124fdb49b9f219ab2a5dc592e6a59f6c09064775ea9349bcf4eed9d72214abb648de649ab872174c35635c945c04
30 DIST llvm-project-15.0.3.src.tar.xz 112069972 BLAKE2B 3d29bab890467ba87fedcc4e76522f444e63e3dfbe546793f8e67821bcd403bad460ea176254c9e0b72d60ea56b8480e498a7f610477c1108732d178804c26cd SHA512 d378d417f01c56534f301cfe6cb4958d811c04ae22acaacc917e7e5f0380859d40ce19dffb265d046b70fff95dbc2e759f492e4d5af0ade52f21ebaa8da65856
31 DIST llvm-project-15.0.3.src.tar.xz.sig 438 BLAKE2B e7e0614e144eb878f694c12e97cf42ff8476e47cb55e8f259eb2ec52e303463ad753771271512e89baf0137c1382b11cfa028c85324174ebcd054a124000f537 SHA512 41229bebdb0c2df9a5e3a4d6f02d39fac7dc91f21895a659523beab4fa3ef99ff06eff5e4386221369b6e2b6f8fe974d67b7d8496d5911ce484d09ae0db8b916
32 +DIST llvm-project-15.0.4.src.tar.xz 110936424 BLAKE2B a02b76ad161e352b4d3d84baffdada9c6a0e704de7a2c4017df4d4d05a9e9d02113791cd7d91c3edfa1f5bcb7ab95e1772d60f7061514928c6828600f41a8322 SHA512 9d5b664dd77c08130601636f9d6c006b257f369470ce823aa56d06698a9f0edfec42f2c90da934b9ad52c4d7960d9a024ea46dc9640275be6d191b1ba9869459
33 +DIST llvm-project-15.0.4.src.tar.xz.sig 566 BLAKE2B f1a7be65fcce932dc125ae2b498f68a14e68dad0d7a1e031343c52c5dafb7b123e346f3efa50a7693584361abf01efe9401b1b5781dee6b92dc1045e538e9b7b SHA512 35899ffbd13fc44cade54246a423450571cb4b62b8d706864daa3eef2377c48e24ef3113218e39e29de995b7f7fa307f9187552766576c9050fd924beb517f6e
34 DIST llvm-project-b34ea582774c057d9bf5591174d683fd3d8aa02b.tar.gz 169735900 BLAKE2B d3a82a07f855b038071fc8eb3f41a88b4c220a577219985ecddeb9a535ea8b159dbad575699997d90a49db74c074b5f4354ad707e91d6934daaa7319e0d8ee9b SHA512 3f5525c7d893bdac701cff4cf82dafc31608920d788d9b7401654f320b2432528cf4ae8ef013182807b3dc0c5b758c71f1efeedb672dd47fdb8aa6f434dfb583
35 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
36
37 diff --git a/sys-libs/compiler-rt/compiler-rt-15.0.4.ebuild b/sys-libs/compiler-rt/compiler-rt-15.0.4.ebuild
38 new file mode 100644
39 index 000000000000..044c81a79eb4
40 --- /dev/null
41 +++ b/sys-libs/compiler-rt/compiler-rt-15.0.4.ebuild
42 @@ -0,0 +1,150 @@
43 +# Copyright 1999-2022 Gentoo Authors
44 +# Distributed under the terms of the GNU General Public License v2
45 +
46 +EAPI=8
47 +
48 +PYTHON_COMPAT=( python3_{8..11} )
49 +inherit cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
50 +
51 +DESCRIPTION="Compiler runtime library for clang (built-in part)"
52 +HOMEPAGE="https://llvm.org/"
53 +
54 +LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
55 +SLOT="${LLVM_VERSION}"
56 +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
57 +IUSE="+abi_x86_32 abi_x86_64 +clang debug test"
58 +RESTRICT="!test? ( test ) !clang? ( test )"
59 +
60 +DEPEND="
61 + sys-devel/llvm:${LLVM_MAJOR}
62 +"
63 +BDEPEND="
64 + >=dev-util/cmake-3.16
65 + clang? ( sys-devel/clang )
66 + test? (
67 + $(python_gen_any_dep ">=dev-python/lit-15[\${PYTHON_USEDEP}]")
68 + =sys-devel/clang-${LLVM_VERSION}*:${LLVM_MAJOR}
69 + )
70 + !test? (
71 + ${PYTHON_DEPS}
72 + )
73 +"
74 +
75 +LLVM_COMPONENTS=( compiler-rt cmake llvm/cmake )
76 +LLVM_PATCHSET=${PV/_/-}
77 +llvm.org_set_globals
78 +
79 +python_check_deps() {
80 + use test || return 0
81 + python_has_version ">=dev-python/lit-15[${PYTHON_USEDEP}]"
82 +}
83 +
84 +pkg_pretend() {
85 + if ! use clang && ! tc-is-clang; then
86 + ewarn "Building using a compiler other than clang may result in broken atomics"
87 + ewarn "library. Enable USE=clang unless you have a very good reason not to."
88 + fi
89 +}
90 +
91 +pkg_setup() {
92 + # Darwin Prefix builds do not have llvm installed yet, so rely on
93 + # bootstrap-prefix to set the appropriate path vars to LLVM instead
94 + # of using llvm_pkg_setup.
95 + if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then
96 + LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
97 + fi
98 + python-any-r1_pkg_setup
99 +}
100 +
101 +test_compiler() {
102 + $(tc-getCC) ${CFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c - \
103 + <<<'int main() { return 0; }' &>/dev/null
104 +}
105 +
106 +src_configure() {
107 + # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
108 + use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
109 +
110 + # pre-set since we need to pass it to cmake
111 + BUILD_DIR=${WORKDIR}/${P}_build
112 +
113 + if use clang; then
114 + # Only do this conditionally to allow overriding with
115 + # e.g. CC=clang-13 in case of breakage
116 + if ! tc-is-clang ; then
117 + local -x CC=${CHOST}-clang
118 + local -x CXX=${CHOST}-clang++
119 + fi
120 +
121 + strip-unsupported-flags
122 + fi
123 +
124 + if ! test_compiler; then
125 + local nolib_flags=( -nodefaultlibs -lc )
126 +
127 + if test_compiler "${nolib_flags[@]}"; then
128 + local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
129 + ewarn "${CC} seems to lack runtime, trying with ${nolib_flags[*]}"
130 + elif test_compiler "${nolib_flags[@]}" -nostartfiles; then
131 + # Avoiding -nostartfiles earlier on for bug #862540,
132 + # and set available entry symbol for bug #862798.
133 + nolib_flags+=( -nostartfiles -emain )
134 +
135 + local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
136 + ewarn "${CC} seems to lack runtime, trying with ${nolib_flags[*]}"
137 + fi
138 + fi
139 +
140 + local mycmakeargs=(
141 + -DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${LLVM_VERSION}"
142 +
143 + -DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
144 + -DCOMPILER_RT_BUILD_LIBFUZZER=OFF
145 + -DCOMPILER_RT_BUILD_MEMPROF=OFF
146 + -DCOMPILER_RT_BUILD_ORC=OFF
147 + -DCOMPILER_RT_BUILD_PROFILE=OFF
148 + -DCOMPILER_RT_BUILD_SANITIZERS=OFF
149 + -DCOMPILER_RT_BUILD_XRAY=OFF
150 +
151 + -DPython3_EXECUTABLE="${PYTHON}"
152 + )
153 +
154 + if use amd64; then
155 + mycmakeargs+=(
156 + -DCAN_TARGET_i386=$(usex abi_x86_32)
157 + -DCAN_TARGET_x86_64=$(usex abi_x86_64)
158 + )
159 + fi
160 +
161 + if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
162 + mycmakeargs+=(
163 + # setting -isysroot is disabled with compiler-rt-prefix-paths.patch
164 + # this allows adding arm64 support using SDK in EPREFIX
165 + -DDARWIN_macosx_CACHED_SYSROOT="${EPREFIX}/MacOSX.sdk"
166 + # Set version based on the SDK in EPREFIX.
167 + # This disables i386 for SDK >= 10.15
168 + -DDARWIN_macosx_OVERRIDE_SDK_VERSION="$(realpath ${EPREFIX}/MacOSX.sdk | sed -e 's/.*MacOSX\(.*\)\.sdk/\1/')"
169 + # Use our libtool instead of looking it up with xcrun
170 + -DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool"
171 + )
172 + fi
173 +
174 + if use test; then
175 + mycmakeargs+=(
176 + -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
177 + -DLLVM_LIT_ARGS="$(get_lit_flags)"
178 +
179 + -DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang"
180 + -DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang++"
181 + )
182 + fi
183 +
184 + cmake_src_configure
185 +}
186 +
187 +src_test() {
188 + # respect TMPDIR!
189 + local -x LIT_PRESERVES_TMP=1
190 +
191 + cmake_build check-builtins
192 +}