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