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, 08 Nov 2021 11:25:46
Message-Id: 1636370726.41d43c0ef5c11868f417cda43840c0bcc42a73ed.mgorny@gentoo
1 commit: 41d43c0ef5c11868f417cda43840c0bcc42a73ed
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Mon Nov 8 11:04:19 2021 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Mon Nov 8 11:25:26 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41d43c0e
7
8 sys-libs/libcxxabi: Remove 10*
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 sys-libs/libcxxabi/Manifest | 1 -
13 sys-libs/libcxxabi/libcxxabi-10.0.1.ebuild | 115 -----------------------------
14 2 files changed, 116 deletions(-)
15
16 diff --git a/sys-libs/libcxxabi/Manifest b/sys-libs/libcxxabi/Manifest
17 index 10303759a73..826997b3c68 100644
18 --- a/sys-libs/libcxxabi/Manifest
19 +++ b/sys-libs/libcxxabi/Manifest
20 @@ -1,4 +1,3 @@
21 -DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
22 DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
23 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
24 DIST llvmorg-13.0.0.tar.gz 147270176 BLAKE2B 628f316b580e1edf3a58d4825b724df759e6ed2a4116802470c04562caefc392fa325c91f388036365a2e45a9595cca6d3557fab12984fc8bcfef29c9116d822 SHA512 8004c05d32b9720fb3391783621690c1df9bd1e97e72cbff9192ed88a84b0acd303b61432145fa917b5b5e548c8cee29b24ef8547dcc8677adf4816e7a8a0eb2
25
26 diff --git a/sys-libs/libcxxabi/libcxxabi-10.0.1.ebuild b/sys-libs/libcxxabi/libcxxabi-10.0.1.ebuild
27 deleted file mode 100644
28 index 7aa13e0d8e6..00000000000
29 --- a/sys-libs/libcxxabi/libcxxabi-10.0.1.ebuild
30 +++ /dev/null
31 @@ -1,115 +0,0 @@
32 -# Copyright 1999-2021 Gentoo Authors
33 -# Distributed under the terms of the GNU General Public License v2
34 -
35 -EAPI=7
36 -
37 -CMAKE_ECLASS=cmake
38 -PYTHON_COMPAT=( python3_{7..9} )
39 -inherit cmake-multilib llvm llvm.org python-any-r1 toolchain-funcs
40 -
41 -DESCRIPTION="Low level support for a standard C++ library"
42 -HOMEPAGE="https://libcxxabi.llvm.org/"
43 -# libcxx is needed uncondtionally for the headers
44 -LLVM_COMPONENTS=( libcxx{abi,} )
45 -llvm.org_set_globals
46 -
47 -LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
48 -SLOT="0"
49 -KEYWORDS="amd64 arm arm64 x86"
50 -IUSE="+libunwind static-libs test elibc_musl"
51 -RESTRICT="!test? ( test )"
52 -
53 -RDEPEND="
54 - libunwind? (
55 - || (
56 - >=sys-libs/libunwind-1.0.1-r1[static-libs?,${MULTILIB_USEDEP}]
57 - >=sys-libs/llvm-libunwind-3.9.0-r1[static-libs?,${MULTILIB_USEDEP}]
58 - )
59 - )"
60 -# llvm-6 for new lit options
61 -DEPEND="${RDEPEND}
62 - >=sys-devel/llvm-6"
63 -BDEPEND="
64 - test? ( >=sys-devel/clang-3.9.0
65 - $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )"
66 -
67 -python_check_deps() {
68 - has_version "dev-python/lit[${PYTHON_USEDEP}]"
69 -}
70 -
71 -pkg_setup() {
72 - llvm_pkg_setup
73 - use test && python-any-r1_pkg_setup
74 -}
75 -
76 -multilib_src_configure() {
77 - # link against compiler-rt instead of libgcc if we are using clang with libunwind
78 - local want_compiler_rt=OFF
79 - if use libunwind && tc-is-clang; then
80 - local compiler_rt=$($(tc-getCC) ${CFLAGS} ${CPPFLAGS} \
81 - ${LDFLAGS} -print-libgcc-file-name)
82 - if [[ ${compiler_rt} == *libclang_rt* ]]; then
83 - want_compiler_rt=ON
84 - fi
85 - fi
86 -
87 - local libdir=$(get_libdir)
88 - local mycmakeargs=(
89 - -DLIBCXXABI_LIBDIR_SUFFIX=${libdir#lib}
90 - -DLIBCXXABI_ENABLE_SHARED=ON
91 - -DLIBCXXABI_ENABLE_STATIC=$(usex static-libs)
92 - -DLIBCXXABI_USE_LLVM_UNWINDER=$(usex libunwind)
93 - -DLIBCXXABI_INCLUDE_TESTS=$(usex test)
94 - -DLIBCXXABI_USE_COMPILER_RT=${want_compiler_rt}
95 -
96 - -DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}"/libcxx/include
97 - # upstream is omitting standard search path for this
98 - # probably because gcc & clang are bundling their own unwind.h
99 - -DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include
100 - )
101 - if use test; then
102 - local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
103 - [[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
104 -
105 - mycmakeargs+=(
106 - -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
107 - -DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}"
108 - )
109 - fi
110 - cmake_src_configure
111 -}
112 -
113 -build_libcxx() {
114 - local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/$(get_libdir)"
115 - local CMAKE_USE_DIR=${WORKDIR}/libcxx
116 - local BUILD_DIR=${BUILD_DIR}/libcxx
117 - local mycmakeargs=(
118 - -DLIBCXX_LIBDIR_SUFFIX=
119 - -DLIBCXX_ENABLE_SHARED=OFF
120 - -DLIBCXX_ENABLE_STATIC=ON
121 - -DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF
122 - -DLIBCXX_CXX_ABI=libcxxabi
123 - -DLIBCXX_CXX_ABI_INCLUDE_PATHS="${S}"/include
124 - -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
125 - -DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
126 - -DLIBCXX_HAS_GCC_S_LIB=OFF
127 - -DLIBCXX_INCLUDE_TESTS=OFF
128 - )
129 -
130 - cmake_src_configure
131 - cmake_src_compile
132 -}
133 -
134 -multilib_src_test() {
135 - # build a local copy of libc++ for testing to avoid circular dep
136 - build_libcxx
137 - mv "${BUILD_DIR}"/libcxx/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" || die
138 -
139 - local -x LIT_PRESERVES_TMP=1
140 - cmake_build check-libcxxabi
141 -}
142 -
143 -multilib_src_install_all() {
144 - insinto /usr/include/libcxxabi
145 - doins -r include/.
146 -}