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: Tue, 20 Sep 2022 11:12:18
Message-Id: 1663672117.3382a8a5a6b9799061541f12c99740626dc02e03.mgorny@gentoo
1 commit: 3382a8a5a6b9799061541f12c99740626dc02e03
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Tue Sep 20 11:08:37 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Tue Sep 20 11:08:37 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3382a8a5
7
8 sys-libs/libcxxabi: Remove 16.0.0_pre20220915
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_pre20220915.ebuild | 128 ---------------------
14 2 files changed, 129 deletions(-)
15
16 diff --git a/sys-libs/libcxxabi/Manifest b/sys-libs/libcxxabi/Manifest
17 index 9aa50441e632..764cd411b7bf 100644
18 --- a/sys-libs/libcxxabi/Manifest
19 +++ b/sys-libs/libcxxabi/Manifest
20 @@ -1,4 +1,3 @@
21 -DIST llvm-project-02a27b38909edc46c41732f79a837c95c9992d5a.tar.gz 167414990 BLAKE2B cd9c4be6d3155a4cbf1abff9d8246b9d6fea98e29459c226bda36df250cc22883f08175514fce037d146866d521a56669678b5c35b5163b38532b8c2920b25a6 SHA512 e862e148b8f053d8f4d40de8db9a4db587cb0c7b4120fe433d769aa2772a1aabd697c3c3f8ee34f547ee12c4bc4355116d5694d5f451264f8719d4af0fb32cb0
22 DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f15e428f22a536a17e5f4e3eb29a003b8a8ec0abe0fa3e072591161d5f30ef7d8867c1ce34d1b341ad858e93c00263499941a99 SHA512 6fc6eeb60fac698702d1aac495fc0161eb7216a1f8db2020af8fccec5837831f7cc20dc2a169bf4f0b5f520748280b4a86621f3697d622aa58faaa45dbfaad13
23 DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
24 DIST llvm-project-15.0.0.src.tar.xz 112062796 BLAKE2B 947917b6c75cbd8882133dc01f57013523274962371ac5ae4a22b010f8a7d5d31288c1d9847bf19ba919fa3110fe34a8ff937107fe19bd064ed87bf4d08d8a51 SHA512 e5aacbe7574dcec62017cc03c9fa2ee4cf075125a3d6c3975c38f06e91adcebb1ff92bcf40c6dd67db087813c60b15a04f1424c713d751199518b58025ce87fc
25
26 diff --git a/sys-libs/libcxxabi/libcxxabi-16.0.0_pre20220915.ebuild b/sys-libs/libcxxabi/libcxxabi-16.0.0_pre20220915.ebuild
27 deleted file mode 100644
28 index 893a76363592..000000000000
29 --- a/sys-libs/libcxxabi/libcxxabi-16.0.0_pre20220915.ebuild
30 +++ /dev/null
31 @@ -1,128 +0,0 @@
32 -# Copyright 1999-2022 Gentoo Authors
33 -# Distributed under the terms of the GNU General Public License v2
34 -
35 -EAPI=8
36 -
37 -PYTHON_COMPAT=( python3_{8..11} )
38 -inherit cmake-multilib flag-o-matic llvm llvm.org python-any-r1 \
39 - toolchain-funcs
40 -
41 -DESCRIPTION="Low level support for a standard C++ library"
42 -HOMEPAGE="https://libcxxabi.llvm.org/"
43 -
44 -LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
45 -SLOT="0"
46 -KEYWORDS=""
47 -IUSE="+clang static-libs test"
48 -REQUIRED_USE="test? ( clang )"
49 -RESTRICT="!test? ( test )"
50 -
51 -# in 15.x, cxxabi.h is moving from libcxx to libcxxabi
52 -RDEPEND+="
53 - !<sys-libs/libcxx-15
54 -"
55 -# llvm-6 for new lit options
56 -DEPEND="
57 - ${RDEPEND}
58 - >=sys-devel/llvm-6
59 -"
60 -BDEPEND="
61 - clang? (
62 - sys-devel/clang
63 - )
64 - !test? (
65 - ${PYTHON_DEPS}
66 - )
67 - test? (
68 - $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
69 - )
70 -"
71 -
72 -LLVM_COMPONENTS=( runtimes libcxx{abi,} llvm/cmake cmake )
73 -LLVM_TEST_COMPONENTS=( llvm/utils/llvm-lit )
74 -llvm.org_set_globals
75 -
76 -python_check_deps() {
77 - use test || return 0
78 - python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
79 -}
80 -
81 -pkg_setup() {
82 - # darwin prefix builds do not have llvm installed yet, so rely on bootstrap-prefix
83 - # to set the appropriate path vars to LLVM instead 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 -multilib_src_configure() {
91 - if use clang && ! tc-is-clang; then
92 - # Only do this conditionally to allow overriding with
93 - # e.g. CC=clang-13 in case of breakage
94 - local -x CC=${CHOST}-clang
95 - local -x CXX=${CHOST}-clang++
96 - strip-unsupported-flags
97 - fi
98 -
99 - # link against compiler-rt instead of libgcc if this is what clang does
100 - local want_compiler_rt=OFF
101 - if tc-is-clang; then
102 - local compiler_rt=$($(tc-getCC) ${CFLAGS} ${CPPFLAGS} \
103 - ${LDFLAGS} -print-libgcc-file-name)
104 - if [[ ${compiler_rt} == *libclang_rt* ]]; then
105 - want_compiler_rt=ON
106 - fi
107 - fi
108 -
109 - local libdir=$(get_libdir)
110 - local mycmakeargs=(
111 - -DCMAKE_CXX_COMPILER_TARGET="${CHOST}"
112 - -DPython3_EXECUTABLE="${PYTHON}"
113 - -DLLVM_ENABLE_RUNTIMES="libcxxabi;libcxx"
114 - -DLLVM_INCLUDE_TESTS=OFF
115 - -DLLVM_LIBDIR_SUFFIX=${libdir#lib}
116 - -DLIBCXXABI_ENABLE_SHARED=ON
117 - -DLIBCXXABI_ENABLE_STATIC=$(usex static-libs)
118 - -DLIBCXXABI_INCLUDE_TESTS=$(usex test)
119 - -DLIBCXXABI_USE_COMPILER_RT=${want_compiler_rt}
120 -
121 - # upstream is omitting standard search path for this
122 - # probably because gcc & clang are bundling their own unwind.h
123 - -DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include
124 -
125 - -DLIBCXX_LIBDIR_SUFFIX=
126 - -DLIBCXX_ENABLE_SHARED=ON
127 - -DLIBCXX_ENABLE_STATIC=OFF
128 - -DLIBCXX_CXX_ABI=libcxxabi
129 - -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
130 - -DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
131 - -DLIBCXX_HAS_GCC_S_LIB=OFF
132 - -DLIBCXX_INCLUDE_BENCHMARKS=OFF
133 - -DLIBCXX_INCLUDE_TESTS=OFF
134 - )
135 - if use test; then
136 - local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
137 - [[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
138 -
139 - mycmakeargs+=(
140 - -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
141 - -DLLVM_LIT_ARGS="$(get_lit_flags)"
142 - -DPython3_EXECUTABLE="${PYTHON}"
143 - )
144 - fi
145 - cmake_src_configure
146 -}
147 -
148 -multilib_src_compile() {
149 - cmake_build cxxabi
150 -}
151 -
152 -multilib_src_test() {
153 - local -x LIT_PRESERVES_TMP=1
154 - cmake_build check-cxxabi
155 -}
156 -
157 -multilib_src_install() {
158 - DESTDIR="${D}" cmake_build install-cxxabi
159 -}