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: Wed, 02 Feb 2022 21:16:40
Message-Id: 1643836577.baa54eee841f3813516019889d053327acfd6597.mgorny@gentoo
1 commit: baa54eee841f3813516019889d053327acfd6597
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed Feb 2 16:45:05 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed Feb 2 21:16:17 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=baa54eee
7
8 sys-libs/libcxxabi: Remove 13.0.1_rc3
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 sys-libs/libcxxabi/Manifest | 1 -
13 sys-libs/libcxxabi/libcxxabi-13.0.1_rc3.ebuild | 125 -------------------------
14 2 files changed, 126 deletions(-)
15
16 diff --git a/sys-libs/libcxxabi/Manifest b/sys-libs/libcxxabi/Manifest
17 index 01e990540752..20315e2d7eee 100644
18 --- a/sys-libs/libcxxabi/Manifest
19 +++ b/sys-libs/libcxxabi/Manifest
20 @@ -1,5 +1,4 @@
21 DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
22 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
23 DIST llvmorg-13.0.0.tar.gz 147270176 BLAKE2B 628f316b580e1edf3a58d4825b724df759e6ed2a4116802470c04562caefc392fa325c91f388036365a2e45a9595cca6d3557fab12984fc8bcfef29c9116d822 SHA512 8004c05d32b9720fb3391783621690c1df9bd1e97e72cbff9192ed88a84b0acd303b61432145fa917b5b5e548c8cee29b24ef8547dcc8677adf4816e7a8a0eb2
24 -DIST llvmorg-13.0.1-rc3.tar.gz 147302323 BLAKE2B 9ac2f97568062d7dd618295a68d6e14898fcd69e2bb66290b999ceb8c12132371f4e9b59d8ba2b252e5e5cb249045676b24fc50c117b2afae20abab98f426582 SHA512 88a04ad02af2d41ec21c7a62bad21ee0e627b7276a16795875afd062ed29ac7fb4aadec5b5e48785a6502c9fd797a4b67d648a21f193c9f7602112870b10a3d1
25 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
26
27 diff --git a/sys-libs/libcxxabi/libcxxabi-13.0.1_rc3.ebuild b/sys-libs/libcxxabi/libcxxabi-13.0.1_rc3.ebuild
28 deleted file mode 100644
29 index d260ea2e3450..000000000000
30 --- a/sys-libs/libcxxabi/libcxxabi-13.0.1_rc3.ebuild
31 +++ /dev/null
32 @@ -1,125 +0,0 @@
33 -# Copyright 1999-2022 Gentoo Authors
34 -# Distributed under the terms of the GNU General Public License v2
35 -
36 -EAPI=7
37 -
38 -CMAKE_ECLASS=cmake
39 -PYTHON_COMPAT=( python3_{8..10} )
40 -inherit cmake-multilib llvm llvm.org python-any-r1 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="+libunwind static-libs test"
49 -RESTRICT="!test? ( test )"
50 -
51 -RDEPEND="
52 - libunwind? (
53 - || (
54 - >=sys-libs/libunwind-1.0.1-r1[static-libs?,${MULTILIB_USEDEP}]
55 - >=sys-libs/llvm-libunwind-3.9.0-r1[static-libs?,${MULTILIB_USEDEP}]
56 - )
57 - )"
58 -# llvm-6 for new lit options
59 -DEPEND="${RDEPEND}
60 - >=sys-devel/llvm-6"
61 -BDEPEND="
62 - test? ( >=sys-devel/clang-3.9.0
63 - $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
64 - )"
65 -
66 -LLVM_COMPONENTS=( libcxx{abi,} llvm/cmake )
67 -llvm.org_set_globals
68 -
69 -python_check_deps() {
70 - has_version "dev-python/lit[${PYTHON_USEDEP}]"
71 -}
72 -
73 -pkg_setup() {
74 - # darwin prefix builds do not have llvm installed yet, so rely on bootstrap-prefix
75 - # to set the appropriate path vars to LLVM instead of using llvm_pkg_setup.
76 - if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then
77 - llvm_pkg_setup
78 - fi
79 - use test && python-any-r1_pkg_setup
80 -}
81 -
82 -multilib_src_configure() {
83 - # we need a configured libc++ for __config_site
84 - wrap_libcxx cmake_src_configure
85 - wrap_libcxx cmake_build generate-cxx-headers
86 -
87 - # link against compiler-rt instead of libgcc if we are using clang with libunwind
88 - local want_compiler_rt=OFF
89 - if use libunwind && tc-is-clang; then
90 - local compiler_rt=$($(tc-getCC) ${CFLAGS} ${CPPFLAGS} \
91 - ${LDFLAGS} -print-libgcc-file-name)
92 - if [[ ${compiler_rt} == *libclang_rt* ]]; then
93 - want_compiler_rt=ON
94 - fi
95 - fi
96 -
97 - local libdir=$(get_libdir)
98 - local mycmakeargs=(
99 - -DLIBCXXABI_LIBDIR_SUFFIX=${libdir#lib}
100 - -DLIBCXXABI_ENABLE_SHARED=ON
101 - -DLIBCXXABI_ENABLE_STATIC=$(usex static-libs)
102 - -DLIBCXXABI_USE_LLVM_UNWINDER=$(usex libunwind)
103 - -DLIBCXXABI_INCLUDE_TESTS=$(usex test)
104 - -DLIBCXXABI_USE_COMPILER_RT=${want_compiler_rt}
105 -
106 - -DLIBCXXABI_LIBCXX_INCLUDES="${BUILD_DIR}"/libcxx/include/c++/v1
107 - # upstream is omitting standard search path for this
108 - # probably because gcc & clang are bundling their own unwind.h
109 - -DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include
110 - -DLIBCXXABI_TARGET_TRIPLE="${CHOST}"
111 - )
112 - if use test; then
113 - local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
114 - [[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
115 -
116 - mycmakeargs+=(
117 - -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
118 - -DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}"
119 - -DPython3_EXECUTABLE="${PYTHON}"
120 - )
121 - fi
122 - cmake_src_configure
123 -}
124 -
125 -wrap_libcxx() {
126 - local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/$(get_libdir)"
127 - local CMAKE_USE_DIR=${WORKDIR}/libcxx
128 - local BUILD_DIR=${BUILD_DIR}/libcxx
129 - local mycmakeargs=(
130 - -DLIBCXX_LIBDIR_SUFFIX=
131 - -DLIBCXX_ENABLE_SHARED=OFF
132 - -DLIBCXX_ENABLE_STATIC=ON
133 - -DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF
134 - -DLIBCXX_CXX_ABI=libcxxabi
135 - -DLIBCXX_CXX_ABI_INCLUDE_PATHS="${S}"/include
136 - -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
137 - -DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
138 - -DLIBCXX_HAS_GCC_S_LIB=OFF
139 - -DLIBCXX_INCLUDE_TESTS=OFF
140 - -DLIBCXX_TARGET_TRIPLE="${CHOST}"
141 - )
142 -
143 - "${@}"
144 -}
145 -
146 -multilib_src_test() {
147 - wrap_libcxx cmake_src_compile
148 - mv "${BUILD_DIR}"/libcxx/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" || die
149 -
150 - local -x LIT_PRESERVES_TMP=1
151 - cmake_build check-cxxabi
152 -}
153 -
154 -multilib_src_install_all() {
155 - insinto /usr/include/libcxxabi
156 - doins -r include/.
157 -}