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/libcxx/
Date: Sat, 26 Nov 2022 11:09:27
Message-Id: 1669460882.d364fca54cd00976d7b9308b99b127d8c5e3cda1.mgorny@gentoo
1 commit: d364fca54cd00976d7b9308b99b127d8c5e3cda1
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sat Nov 26 11:08:02 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sat Nov 26 11:08:02 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d364fca5
7
8 sys-libs/libcxx: Remove 15.0.4
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 sys-libs/libcxx/Manifest | 2 -
13 sys-libs/libcxx/libcxx-15.0.4.ebuild | 204 -----------------------------------
14 2 files changed, 206 deletions(-)
15
16 diff --git a/sys-libs/libcxx/Manifest b/sys-libs/libcxx/Manifest
17 index 9ed63e8badf8..ca3355b320b9 100644
18 --- a/sys-libs/libcxx/Manifest
19 +++ b/sys-libs/libcxx/Manifest
20 @@ -4,8 +4,6 @@ DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f
21 DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
22 DIST llvm-project-15.0.3.src.tar.xz 112069972 BLAKE2B 3d29bab890467ba87fedcc4e76522f444e63e3dfbe546793f8e67821bcd403bad460ea176254c9e0b72d60ea56b8480e498a7f610477c1108732d178804c26cd SHA512 d378d417f01c56534f301cfe6cb4958d811c04ae22acaacc917e7e5f0380859d40ce19dffb265d046b70fff95dbc2e759f492e4d5af0ade52f21ebaa8da65856
23 DIST llvm-project-15.0.3.src.tar.xz.sig 438 BLAKE2B e7e0614e144eb878f694c12e97cf42ff8476e47cb55e8f259eb2ec52e303463ad753771271512e89baf0137c1382b11cfa028c85324174ebcd054a124000f537 SHA512 41229bebdb0c2df9a5e3a4d6f02d39fac7dc91f21895a659523beab4fa3ef99ff06eff5e4386221369b6e2b6f8fe974d67b7d8496d5911ce484d09ae0db8b916
24 -DIST llvm-project-15.0.4.src.tar.xz 110936424 BLAKE2B a02b76ad161e352b4d3d84baffdada9c6a0e704de7a2c4017df4d4d05a9e9d02113791cd7d91c3edfa1f5bcb7ab95e1772d60f7061514928c6828600f41a8322 SHA512 9d5b664dd77c08130601636f9d6c006b257f369470ce823aa56d06698a9f0edfec42f2c90da934b9ad52c4d7960d9a024ea46dc9640275be6d191b1ba9869459
25 -DIST llvm-project-15.0.4.src.tar.xz.sig 566 BLAKE2B f1a7be65fcce932dc125ae2b498f68a14e68dad0d7a1e031343c52c5dafb7b123e346f3efa50a7693584361abf01efe9401b1b5781dee6b92dc1045e538e9b7b SHA512 35899ffbd13fc44cade54246a423450571cb4b62b8d706864daa3eef2377c48e24ef3113218e39e29de995b7f7fa307f9187552766576c9050fd924beb517f6e
26 DIST llvm-project-15.0.5.src.tar.xz 110931004 BLAKE2B d751e3627ee26e60a1a037a4a6cc574a31c4abe038331b86206348ac3ce93a243add2be3a0bbfc2ec5ec3f3562a5b5efea745cb1943c9c9153bc7b0fcf4de22e SHA512 cf2a89ebb6bc9d7e3f1fd09531c84ac9927cdbe5ee13a6fcb8ce4d08e5a9d6d480ad982f62126b9c757beafa283b34f2ba1fbc56223c641e70da2be4627f59a6
27 DIST llvm-project-15.0.5.src.tar.xz.sig 566 BLAKE2B a6e7204abc912045346a36f2b349e0829a4d5b9efcb230fb0c97caa38d5159ca17ffb47ce0485cbab276a4938ff3a5c05ef9f8b0b75f4c2028d870ee33023431 SHA512 312bc09b54408a9265f8102241089b0f674be0832dd5cb1998ff13dbccbe19324d7060ba2680457118dee96a1ff390b16282677ad825d7230008014ecebe47d5
28 DIST llvm-project-7b91798a5d3a8432b296778da4efe169012fb7b4.tar.gz 170989337 BLAKE2B 1ab79554a05f8d7a74c0b4bab319c30375475d3fd089764733744fde55c65eb38967cdb19e5b0211a1543549c2bfc3c0f3d43facb7e041f51988e8a65e4448f3 SHA512 4c4d3a748b967cbc75372d0db87ac48d32271a54047ddeeb028d565fa6b7004b2ab3abd82d8ff4621e50c9410fce28c3044550cc94aaf0f6e4f672498f47aba8
29
30 diff --git a/sys-libs/libcxx/libcxx-15.0.4.ebuild b/sys-libs/libcxx/libcxx-15.0.4.ebuild
31 deleted file mode 100644
32 index 8b5e382b8889..000000000000
33 --- a/sys-libs/libcxx/libcxx-15.0.4.ebuild
34 +++ /dev/null
35 @@ -1,204 +0,0 @@
36 -# Copyright 1999-2022 Gentoo Authors
37 -# Distributed under the terms of the GNU General Public License v2
38 -
39 -EAPI=8
40 -
41 -PYTHON_COMPAT=( python3_{8..11} )
42 -inherit cmake-multilib flag-o-matic llvm llvm.org python-any-r1 \
43 - toolchain-funcs
44 -
45 -DESCRIPTION="New implementation of the C++ standard library, targeting C++11"
46 -HOMEPAGE="https://libcxx.llvm.org/"
47 -
48 -LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
49 -SLOT="0"
50 -KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~sparc ~x86 ~x64-macos"
51 -IUSE="+clang +libcxxabi static-libs test"
52 -REQUIRED_USE="test? ( clang )"
53 -RESTRICT="!test? ( test )"
54 -
55 -RDEPEND="
56 - libcxxabi? (
57 - ~sys-libs/libcxxabi-${PV}[static-libs?,${MULTILIB_USEDEP}]
58 - )
59 - !libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )
60 -"
61 -DEPEND="
62 - ${RDEPEND}
63 - sys-devel/llvm:${LLVM_MAJOR}
64 -"
65 -BDEPEND="
66 - clang? (
67 - sys-devel/clang:${LLVM_MAJOR}
68 - )
69 - !test? (
70 - ${PYTHON_DEPS}
71 - )
72 - test? (
73 - >=dev-util/cmake-3.16
74 - sys-devel/gdb[python]
75 - $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
76 - )
77 -"
78 -
79 -LLVM_COMPONENTS=( runtimes libcxx{,abi} llvm/{cmake,utils/llvm-lit} cmake )
80 -llvm.org_set_globals
81 -
82 -python_check_deps() {
83 - use test || return 0
84 - python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
85 -}
86 -
87 -pkg_setup() {
88 - # Darwin Prefix builds do not have llvm installed yet, so rely on
89 - # bootstrap-prefix to set the appropriate path vars to LLVM instead
90 - # of using llvm_pkg_setup.
91 - if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then
92 - LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
93 - fi
94 - python-any-r1_pkg_setup
95 -
96 - if ! use libcxxabi && ! tc-is-gcc ; then
97 - eerror "To build ${PN} against libsupc++, you have to use gcc. Other"
98 - eerror "compilers are not supported. Please set CC=gcc and CXX=g++"
99 - eerror "and try again."
100 - die
101 - fi
102 -}
103 -
104 -test_compiler() {
105 - $(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c++ - \
106 - <<<'int main() { return 0; }' &>/dev/null
107 -}
108 -
109 -src_configure() {
110 - # note: we need to do this before multilib kicks in since it will
111 - # alter the CHOST
112 - local cxxabi cxxabi_incs
113 - if use libcxxabi; then
114 - cxxabi=system-libcxxabi
115 - cxxabi_incs="${EPREFIX}/usr/include/c++/v1"
116 - else
117 - local gcc_inc="${EPREFIX}/usr/lib/gcc/${CHOST}/$(gcc-fullversion)/include/g++-v$(gcc-major-version)"
118 - cxxabi=libsupc++
119 - cxxabi_incs="${gcc_inc};${gcc_inc}/${CHOST}"
120 - fi
121 -
122 - multilib-minimal_src_configure
123 -}
124 -
125 -multilib_src_configure() {
126 - if use clang; then
127 - local -x CC=${CHOST}-clang
128 - local -x CXX=${CHOST}-clang++
129 - strip-unsupported-flags
130 - fi
131 -
132 - # link to compiler-rt
133 - local use_compiler_rt=OFF
134 - [[ $(tc-get-c-rtlib) == compiler-rt ]] && use_compiler_rt=ON
135 -
136 - # bootstrap: cmake is unhappy if compiler can't link to stdlib
137 - local nolib_flags=( -nodefaultlibs -lc )
138 - if ! test_compiler; then
139 - if test_compiler "${nolib_flags[@]}"; then
140 - local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
141 - ewarn "${CXX} seems to lack runtime, trying with ${nolib_flags[*]}"
142 - fi
143 - fi
144 -
145 - local libdir=$(get_libdir)
146 - local mycmakeargs=(
147 - -DCMAKE_CXX_COMPILER_TARGET="${CHOST}"
148 - -DPython3_EXECUTABLE="${PYTHON}"
149 - -DLLVM_ENABLE_RUNTIMES=libcxx
150 - -DLLVM_INCLUDE_TESTS=OFF
151 - -DLLVM_LIBDIR_SUFFIX=${libdir#lib}
152 -
153 - -DLIBCXX_ENABLE_SHARED=ON
154 - -DLIBCXX_ENABLE_STATIC=$(usex static-libs)
155 - -DLIBCXX_CXX_ABI=${cxxabi}
156 - -DLIBCXX_CXX_ABI_INCLUDE_PATHS=${cxxabi_incs}
157 - # we're using our own mechanism for generating linker scripts
158 - -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
159 - -DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
160 - -DLIBCXX_INCLUDE_BENCHMARKS=OFF
161 - -DLIBCXX_INCLUDE_TESTS=$(usex test)
162 - -DLIBCXX_USE_COMPILER_RT=${use_compiler_rt}
163 - )
164 -
165 - if use test; then
166 - mycmakeargs+=(
167 - -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
168 - -DLLVM_LIT_ARGS="$(get_lit_flags)"
169 - -DPython3_EXECUTABLE="${PYTHON}"
170 - )
171 - fi
172 - cmake_src_configure
173 -}
174 -
175 -multilib_src_compile() {
176 - cmake_src_compile
177 - if [[ ${CHOST} != *-darwin* ]] ; then
178 - gen_shared_ldscript
179 - use static-libs && gen_static_ldscript
180 - fi
181 -}
182 -
183 -multilib_src_test() {
184 - local -x LIT_PRESERVES_TMP=1
185 - cmake_build check-cxx
186 -}
187 -
188 -multilib_src_install() {
189 - cmake_src_install
190 - # since we've replaced libc++.{a,so} with ldscripts, now we have to
191 - # install the extra symlinks
192 - if [[ ${CHOST} != *-darwin* ]] ; then
193 - dolib.so lib/libc++_shared.so
194 - use static-libs && dolib.a lib/libc++_static.a
195 - fi
196 -}
197 -
198 -# Usage: deps
199 -gen_ldscript() {
200 - local output_format
201 - output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p')
202 - [[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )"
203 -
204 - cat <<-END_LDSCRIPT
205 -/* GNU ld script
206 - Include missing dependencies
207 -*/
208 -${output_format}
209 -GROUP ( $@ )
210 -END_LDSCRIPT
211 -}
212 -
213 -gen_static_ldscript() {
214 - # Move it first.
215 - mv lib/libc++{,_static}.a || die
216 - # Generate libc++.a ldscript for inclusion of its dependencies so that
217 - # clang++ -stdlib=libc++ -static works out of the box.
218 - local deps=(
219 - libc++_static.a
220 - $(usex libcxxabi libc++abi.a libsupc++.a)
221 - )
222 - # On Linux/glibc it does not link without libpthread or libdl. It is
223 - # fine on FreeBSD.
224 - use elibc_glibc && deps+=( libpthread.a libdl.a )
225 -
226 - gen_ldscript "${deps[*]}" > lib/libc++.a || die
227 -}
228 -
229 -gen_shared_ldscript() {
230 - # Move it first.
231 - mv lib/libc++{,_shared}.so || die
232 - local deps=(
233 - libc++_shared.so
234 - # libsupc++ doesn't have a shared version
235 - $(usex libcxxabi libc++abi.so libsupc++.a)
236 - )
237 -
238 - gen_ldscript "${deps[*]}" > lib/libc++.so || die
239 -}