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: Thu, 17 Jun 2021 09:05:28
Message-Id: 1623920711.9002beed3003efc0fac849790a1f2795476b4e22.mgorny@gentoo
1 commit: 9002beed3003efc0fac849790a1f2795476b4e22
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jun 17 08:55:58 2021 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Thu Jun 17 09:05:11 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9002beed
7
8 sys-libs/libcxxabi: Bump to 12.0.1rc2
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_rc2.ebuild | 122 +++++++++++++++++++++++++
14 2 files changed, 123 insertions(+)
15
16 diff --git a/sys-libs/libcxxabi/Manifest b/sys-libs/libcxxabi/Manifest
17 index 1277a68d864..50f195a03b4 100644
18 --- a/sys-libs/libcxxabi/Manifest
19 +++ b/sys-libs/libcxxabi/Manifest
20 @@ -2,3 +2,4 @@ DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3
21 DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
22 DIST llvmorg-12.0.0.tar.gz 134226215 BLAKE2B f9c3ba8c58571855caa4f206fd285c9b5be66672fb0814cb8bc0964a051f57f5d35013aa1e27cbda502652b37df1ec23474129109e76a42066847860db441dbe SHA512 0cff02155c5ac0d6db2b72d60d9819d5b5dd859663b45f721b1c7540239c2fceb1f57d9173f6870c49de851c242ed8e85c5c6d6577a1f8092a7c5dcd12513b26
23 DIST llvmorg-12.0.1-rc1.tar.gz 134261735 BLAKE2B d29510495641c06e6d7a5ac165e6d34e0ba15d1a5b786534e186e341e3a0550cdd3d8a2b61deb3e2bf44c0b0ff8561224bf7f8cebc2ce9415639cb67ceae289e SHA512 4595a26df56eed7d5941240fe92116ad2f1c61639f0f464697c2c530a601347032fbad6802d1fa915ced8574c7b30ef05bc8c0be737784c844d3860892817e6e
24 +DIST llvmorg-12.0.1-rc2.tar.gz 134274147 BLAKE2B 2d3f6ce8d5239cf2e5ea52f4b9020d6a8fedb8d6a4df02ca0d8e4398237f4eb967865e1e65570d16cd191865281b9619a63905c1e1c47b31183b881e97e49867 SHA512 cdebb954016dc92251cd9c6281804f7a36e7bc8c6f101a6817d96cc121aba4d361fb99501c259409a29c90d7749b224be670c41177fe43fa64b730ff294831b8
25
26 diff --git a/sys-libs/libcxxabi/libcxxabi-12.0.1_rc2.ebuild b/sys-libs/libcxxabi/libcxxabi-12.0.1_rc2.ebuild
27 new file mode 100644
28 index 00000000000..8c24d969111
29 --- /dev/null
30 +++ b/sys-libs/libcxxabi/libcxxabi-12.0.1_rc2.ebuild
31 @@ -0,0 +1,122 @@
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 +
44 +LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
45 +SLOT="0"
46 +KEYWORDS=""
47 +IUSE="+libunwind static-libs test elibc_musl"
48 +RESTRICT="!test? ( test )"
49 +
50 +RDEPEND="
51 + libunwind? (
52 + || (
53 + >=sys-libs/libunwind-1.0.1-r1[static-libs?,${MULTILIB_USEDEP}]
54 + >=sys-libs/llvm-libunwind-3.9.0-r1[static-libs?,${MULTILIB_USEDEP}]
55 + )
56 + )"
57 +# llvm-6 for new lit options
58 +DEPEND="${RDEPEND}
59 + >=sys-devel/llvm-6"
60 +BDEPEND="
61 + test? ( >=sys-devel/clang-3.9.0
62 + $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
63 + )"
64 +
65 +# libcxx is needed uncondtionally for the headers
66 +LLVM_COMPONENTS=( libcxx{abi,} llvm/cmake/modules )
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 + # 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 +}