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, 17 May 2021 06:49:56
Message-Id: 1621234103.598d9745a8b02e8bcdea788d64daee497dd5bdd8.mgorny@gentoo
1 commit: 598d9745a8b02e8bcdea788d64daee497dd5bdd8
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sun May 16 20:26:39 2021 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Mon May 17 06:48:23 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=598d9745
7
8 sys-libs/libcxxabi: Remove 11.0.0
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 sys-libs/libcxxabi/Manifest | 1 -
13 sys-libs/libcxxabi/libcxxabi-11.0.0.ebuild | 121 -----------------------------
14 2 files changed, 122 deletions(-)
15
16 diff --git a/sys-libs/libcxxabi/Manifest b/sys-libs/libcxxabi/Manifest
17 index 09cfebc2769..fe7e7964d29 100644
18 --- a/sys-libs/libcxxabi/Manifest
19 +++ b/sys-libs/libcxxabi/Manifest
20 @@ -1,5 +1,4 @@
21 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
22 -DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984 SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2
23 DIST llvmorg-11.0.1.tar.gz 122790338 BLAKE2B 0130996b4a8c4d9f757136fd7fb318068c9bfdc565060dec0d4336480c4ab66c4ae3185a7fdb05f13cf9ee8fd4123b09df938881b75d6e5d3689595114b7e32a SHA512 f5e6ef0b3111aae08a89cd01adb2ff4abfa9ef779c68b9190421d0447efd25c2cc00e5aae9f4764805f5fa31434866043d1510ae7389817e28ae53a5442e2fdf
24 DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
25 DIST llvmorg-12.0.0.tar.gz 134226215 BLAKE2B f9c3ba8c58571855caa4f206fd285c9b5be66672fb0814cb8bc0964a051f57f5d35013aa1e27cbda502652b37df1ec23474129109e76a42066847860db441dbe SHA512 0cff02155c5ac0d6db2b72d60d9819d5b5dd859663b45f721b1c7540239c2fceb1f57d9173f6870c49de851c242ed8e85c5c6d6577a1f8092a7c5dcd12513b26
26
27 diff --git a/sys-libs/libcxxabi/libcxxabi-11.0.0.ebuild b/sys-libs/libcxxabi/libcxxabi-11.0.0.ebuild
28 deleted file mode 100644
29 index e0342a38384..00000000000
30 --- a/sys-libs/libcxxabi/libcxxabi-11.0.0.ebuild
31 +++ /dev/null
32 @@ -1,121 +0,0 @@
33 -# Copyright 1999-2021 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_{7..9} )
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 -# libcxx is needed uncondtionally for the headers
45 -LLVM_COMPONENTS=( libcxx{abi,} )
46 -LLVM_TEST_COMPONENTS=( llvm/cmake )
47 -llvm.org_set_globals
48 -
49 -LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
50 -SLOT="0"
51 -KEYWORDS="amd64 arm arm64 ~riscv x86 ~x64-macos"
52 -IUSE="+libunwind static-libs test elibc_musl"
53 -RESTRICT="!test? ( test )"
54 -
55 -RDEPEND="
56 - libunwind? (
57 - || (
58 - >=sys-libs/libunwind-1.0.1-r1[static-libs?,${MULTILIB_USEDEP}]
59 - >=sys-libs/llvm-libunwind-3.9.0-r1[static-libs?,${MULTILIB_USEDEP}]
60 - )
61 - )"
62 -# llvm-6 for new lit options
63 -DEPEND="${RDEPEND}
64 - >=sys-devel/llvm-6"
65 -BDEPEND="
66 - test? ( >=sys-devel/clang-3.9.0
67 - $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )"
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 - # link against compiler-rt instead of libgcc if we are using clang with libunwind
84 - local want_compiler_rt=OFF
85 - if use libunwind && tc-is-clang; then
86 - local compiler_rt=$($(tc-getCC) ${CFLAGS} ${CPPFLAGS} \
87 - ${LDFLAGS} -print-libgcc-file-name)
88 - if [[ ${compiler_rt} == *libclang_rt* ]]; then
89 - want_compiler_rt=ON
90 - fi
91 - fi
92 -
93 - local libdir=$(get_libdir)
94 - local mycmakeargs=(
95 - -DLIBCXXABI_LIBDIR_SUFFIX=${libdir#lib}
96 - -DLIBCXXABI_ENABLE_SHARED=ON
97 - -DLIBCXXABI_ENABLE_STATIC=$(usex static-libs)
98 - -DLIBCXXABI_USE_LLVM_UNWINDER=$(usex libunwind)
99 - -DLIBCXXABI_INCLUDE_TESTS=$(usex test)
100 - -DLIBCXXABI_USE_COMPILER_RT=${want_compiler_rt}
101 -
102 - -DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}"/libcxx/include
103 - # upstream is omitting standard search path for this
104 - # probably because gcc & clang are bundling their own unwind.h
105 - -DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include
106 - )
107 - if use test; then
108 - local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
109 - [[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
110 -
111 - mycmakeargs+=(
112 - -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
113 - -DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}"
114 - -DPython3_EXECUTABLE="${PYTHON}"
115 - )
116 - fi
117 - cmake_src_configure
118 -}
119 -
120 -build_libcxx() {
121 - local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/$(get_libdir)"
122 - local CMAKE_USE_DIR=${WORKDIR}/libcxx
123 - local BUILD_DIR=${BUILD_DIR}/libcxx
124 - local mycmakeargs=(
125 - -DLIBCXX_LIBDIR_SUFFIX=
126 - -DLIBCXX_ENABLE_SHARED=OFF
127 - -DLIBCXX_ENABLE_STATIC=ON
128 - -DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF
129 - -DLIBCXX_CXX_ABI=libcxxabi
130 - -DLIBCXX_CXX_ABI_INCLUDE_PATHS="${S}"/include
131 - -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
132 - -DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
133 - -DLIBCXX_HAS_GCC_S_LIB=OFF
134 - -DLIBCXX_INCLUDE_TESTS=OFF
135 - )
136 -
137 - cmake_src_configure
138 - cmake_src_compile
139 -}
140 -
141 -multilib_src_test() {
142 - # build a local copy of libc++ for testing to avoid circular dep
143 - build_libcxx
144 - mv "${BUILD_DIR}"/libcxx/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" || die
145 -
146 - local -x LIT_PRESERVES_TMP=1
147 - cmake_build check-cxxabi
148 -}
149 -
150 -multilib_src_install_all() {
151 - insinto /usr/include/libcxxabi
152 - doins -r include/.
153 -}