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: Fri, 09 Jul 2021 14:44:55
Message-Id: 1625841871.980af6965057518df0c6b2c1e1170d5f86c58d30.mgorny@gentoo
1 commit: 980af6965057518df0c6b2c1e1170d5f86c58d30
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jul 9 08:43:27 2021 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Fri Jul 9 14:44:31 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=980af696
7
8 sys-libs/libcxxabi: Remove 12.0.1-rc4
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 sys-libs/libcxxabi/Manifest | 1 -
13 sys-libs/libcxxabi/libcxxabi-12.0.1_rc4.ebuild | 122 -------------------------
14 2 files changed, 123 deletions(-)
15
16 diff --git a/sys-libs/libcxxabi/Manifest b/sys-libs/libcxxabi/Manifest
17 index f3cacde58cc..104b03477e7 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.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
23 DIST llvmorg-12.0.0.tar.gz 134226215 BLAKE2B f9c3ba8c58571855caa4f206fd285c9b5be66672fb0814cb8bc0964a051f57f5d35013aa1e27cbda502652b37df1ec23474129109e76a42066847860db441dbe SHA512 0cff02155c5ac0d6db2b72d60d9819d5b5dd859663b45f721b1c7540239c2fceb1f57d9173f6870c49de851c242ed8e85c5c6d6577a1f8092a7c5dcd12513b26
24 -DIST llvmorg-12.0.1-rc4.tar.gz 134278617 BLAKE2B d407421c7244bb125151e69e2a341f1af0a0cf8c1fda3b8ae3d4114c3a285d6307620bbf82b22d96d2c7782b37b0975e87be80c24e3ce1fdc71152734be1e8f8 SHA512 1a2c18435a970491eb9fc9381ba66af726e17dcbd5bf6774f9341b1e82fd35f2e5686844743f5317ebd2106b902c39e09aa98102e58a86e290b29102241c949f
25 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
26
27 diff --git a/sys-libs/libcxxabi/libcxxabi-12.0.1_rc4.ebuild b/sys-libs/libcxxabi/libcxxabi-12.0.1_rc4.ebuild
28 deleted file mode 100644
29 index 5df21898489..00000000000
30 --- a/sys-libs/libcxxabi/libcxxabi-12.0.1_rc4.ebuild
31 +++ /dev/null
32 @@ -1,122 +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_{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 elibc_musl"
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 -# libcxx is needed uncondtionally for the headers
67 -LLVM_COMPONENTS=( libcxx{abi,} llvm/cmake/modules )
68 -llvm.org_set_globals
69 -
70 -python_check_deps() {
71 - has_version "dev-python/lit[${PYTHON_USEDEP}]"
72 -}
73 -
74 -pkg_setup() {
75 - # darwin prefix builds do not have llvm installed yet, so rely on bootstrap-prefix
76 - # to set the appropriate path vars to LLVM instead of using llvm_pkg_setup.
77 - if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then
78 - llvm_pkg_setup
79 - fi
80 - use test && python-any-r1_pkg_setup
81 -}
82 -
83 -multilib_src_configure() {
84 - # link against compiler-rt instead of libgcc if we are using clang with libunwind
85 - local want_compiler_rt=OFF
86 - if use libunwind && tc-is-clang; then
87 - local compiler_rt=$($(tc-getCC) ${CFLAGS} ${CPPFLAGS} \
88 - ${LDFLAGS} -print-libgcc-file-name)
89 - if [[ ${compiler_rt} == *libclang_rt* ]]; then
90 - want_compiler_rt=ON
91 - fi
92 - fi
93 -
94 - local libdir=$(get_libdir)
95 - local mycmakeargs=(
96 - -DLIBCXXABI_LIBDIR_SUFFIX=${libdir#lib}
97 - -DLIBCXXABI_ENABLE_SHARED=ON
98 - -DLIBCXXABI_ENABLE_STATIC=$(usex static-libs)
99 - -DLIBCXXABI_USE_LLVM_UNWINDER=$(usex libunwind)
100 - -DLIBCXXABI_INCLUDE_TESTS=$(usex test)
101 - -DLIBCXXABI_USE_COMPILER_RT=${want_compiler_rt}
102 -
103 - -DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}"/libcxx/include
104 - # upstream is omitting standard search path for this
105 - # probably because gcc & clang are bundling their own unwind.h
106 - -DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include
107 - )
108 - if use test; then
109 - local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
110 - [[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
111 -
112 - mycmakeargs+=(
113 - -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
114 - -DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}"
115 - -DPython3_EXECUTABLE="${PYTHON}"
116 - )
117 - fi
118 - cmake_src_configure
119 -}
120 -
121 -build_libcxx() {
122 - local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/$(get_libdir)"
123 - local CMAKE_USE_DIR=${WORKDIR}/libcxx
124 - local BUILD_DIR=${BUILD_DIR}/libcxx
125 - local mycmakeargs=(
126 - -DLIBCXX_LIBDIR_SUFFIX=
127 - -DLIBCXX_ENABLE_SHARED=OFF
128 - -DLIBCXX_ENABLE_STATIC=ON
129 - -DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF
130 - -DLIBCXX_CXX_ABI=libcxxabi
131 - -DLIBCXX_CXX_ABI_INCLUDE_PATHS="${S}"/include
132 - -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
133 - -DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
134 - -DLIBCXX_HAS_GCC_S_LIB=OFF
135 - -DLIBCXX_INCLUDE_TESTS=OFF
136 - )
137 -
138 - cmake_src_configure
139 - cmake_src_compile
140 -}
141 -
142 -multilib_src_test() {
143 - # build a local copy of libc++ for testing to avoid circular dep
144 - build_libcxx
145 - mv "${BUILD_DIR}"/libcxx/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" || die
146 -
147 - local -x LIT_PRESERVES_TMP=1
148 - cmake_build check-cxxabi
149 -}
150 -
151 -multilib_src_install_all() {
152 - insinto /usr/include/libcxxabi
153 - doins -r include/.
154 -}