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/libcxxabi/
Date: Mon, 26 Sep 2022 15:58:18
Message-Id: 1664207844.057345f13611c15f832abdcc4fded88194bdf8e4.mgorny@gentoo
1 commit: 057345f13611c15f832abdcc4fded88194bdf8e4
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Mon Sep 26 15:57:24 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Mon Sep 26 15:57:24 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=057345f1
7
8 sys-libs/libcxxabi: 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/libcxxabi/Manifest | 1 -
13 .../libcxxabi/libcxxabi-16.0.0_pre20220926.ebuild | 123 ---------------------
14 2 files changed, 124 deletions(-)
15
16 diff --git a/sys-libs/libcxxabi/Manifest b/sys-libs/libcxxabi/Manifest
17 index 04542f02bf03..4d1bc3f24027 100644
18 --- a/sys-libs/libcxxabi/Manifest
19 +++ b/sys-libs/libcxxabi/Manifest
20 @@ -3,5 +3,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/libcxxabi/libcxxabi-16.0.0_pre20220926.ebuild b/sys-libs/libcxxabi/libcxxabi-16.0.0_pre20220926.ebuild
28 deleted file mode 100644
29 index 78be4b5b862f..000000000000
30 --- a/sys-libs/libcxxabi/libcxxabi-16.0.0_pre20220926.ebuild
31 +++ /dev/null
32 @@ -1,123 +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-multilib flag-o-matic llvm llvm.org python-any-r1 \
40 - toolchain-funcs
41 -
42 -DESCRIPTION="Low level support for a standard C++ library"
43 -HOMEPAGE="https://libcxxabi.llvm.org/"
44 -
45 -LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
46 -SLOT="0"
47 -KEYWORDS=""
48 -IUSE="+clang static-libs test"
49 -REQUIRED_USE="test? ( clang )"
50 -RESTRICT="!test? ( test )"
51 -
52 -# in 15.x, cxxabi.h is moving from libcxx to libcxxabi
53 -RDEPEND+="
54 - !<sys-libs/libcxx-15
55 -"
56 -LLVM_MAX_SLOT=${PV%%.*}
57 -DEPEND="
58 - ${RDEPEND}
59 - sys-devel/llvm:${LLVM_MAX_SLOT}
60 -"
61 -BDEPEND="
62 - clang? (
63 - sys-devel/clang:${LLVM_MAX_SLOT}
64 - )
65 - !test? (
66 - ${PYTHON_DEPS}
67 - )
68 - test? (
69 - $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
70 - )
71 -"
72 -
73 -LLVM_COMPONENTS=( runtimes libcxx{abi,} llvm/cmake cmake )
74 -LLVM_TEST_COMPONENTS=( llvm/utils/llvm-lit )
75 -llvm.org_set_globals
76 -
77 -python_check_deps() {
78 - use test || return 0
79 - python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
80 -}
81 -
82 -pkg_setup() {
83 - # darwin prefix builds do not have llvm installed yet, so rely on bootstrap-prefix
84 - # to set the appropriate path vars to LLVM instead of using llvm_pkg_setup.
85 - if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then
86 - llvm_pkg_setup
87 - fi
88 - python-any-r1_pkg_setup
89 -}
90 -
91 -multilib_src_configure() {
92 - if use clang; then
93 - local -x CC=${CHOST}-clang
94 - local -x CXX=${CHOST}-clang++
95 - strip-unsupported-flags
96 - fi
97 -
98 - # link against compiler-rt instead of libgcc if this is what clang does
99 - local want_compiler_rt=OFF
100 - if tc-is-clang; then
101 - local compiler_rt=$($(tc-getCC) ${CFLAGS} ${CPPFLAGS} \
102 - ${LDFLAGS} -print-libgcc-file-name)
103 - if [[ ${compiler_rt} == *libclang_rt* ]]; then
104 - want_compiler_rt=ON
105 - fi
106 - fi
107 -
108 - local libdir=$(get_libdir)
109 - local mycmakeargs=(
110 - -DCMAKE_CXX_COMPILER_TARGET="${CHOST}"
111 - -DPython3_EXECUTABLE="${PYTHON}"
112 - -DLLVM_ENABLE_RUNTIMES="libcxxabi;libcxx"
113 - -DLLVM_INCLUDE_TESTS=OFF
114 - -DLLVM_LIBDIR_SUFFIX=${libdir#lib}
115 - -DLIBCXXABI_ENABLE_SHARED=ON
116 - -DLIBCXXABI_ENABLE_STATIC=$(usex static-libs)
117 - -DLIBCXXABI_INCLUDE_TESTS=$(usex test)
118 - -DLIBCXXABI_USE_COMPILER_RT=${want_compiler_rt}
119 -
120 - # upstream is omitting standard search path for this
121 - # probably because gcc & clang are bundling their own unwind.h
122 - -DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include
123 -
124 - -DLIBCXX_LIBDIR_SUFFIX=
125 - -DLIBCXX_ENABLE_SHARED=ON
126 - -DLIBCXX_ENABLE_STATIC=OFF
127 - -DLIBCXX_CXX_ABI=libcxxabi
128 - -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
129 - -DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
130 - -DLIBCXX_HAS_GCC_S_LIB=OFF
131 - -DLIBCXX_INCLUDE_BENCHMARKS=OFF
132 - -DLIBCXX_INCLUDE_TESTS=OFF
133 - )
134 - if use test; then
135 - mycmakeargs+=(
136 - -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
137 - -DLLVM_LIT_ARGS="$(get_lit_flags)"
138 - -DPython3_EXECUTABLE="${PYTHON}"
139 - )
140 - fi
141 - cmake_src_configure
142 -}
143 -
144 -multilib_src_compile() {
145 - cmake_build cxxabi
146 -}
147 -
148 -multilib_src_test() {
149 - local -x LIT_PRESERVES_TMP=1
150 - cmake_build check-cxxabi
151 -}
152 -
153 -multilib_src_install() {
154 - DESTDIR="${D}" cmake_build install-cxxabi
155 -}