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: Tue, 09 Feb 2021 15:28:35
Message-Id: 1612884503.bc47fc0ca2c018c413e65e2a76200fb46a110ee4.mgorny@gentoo
1 commit: bc47fc0ca2c018c413e65e2a76200fb46a110ee4
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Tue Feb 9 15:26:17 2021 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Tue Feb 9 15:28:23 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc47fc0c
7
8 sys-libs/libcxxabi: Bump to 11.1.0-rc3
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.1.0_rc3.ebuild | 123 +++++++++++++++++++++++++
14 2 files changed, 124 insertions(+)
15
16 diff --git a/sys-libs/libcxxabi/Manifest b/sys-libs/libcxxabi/Manifest
17 index b71e21ccaaa..757ab90ea8c 100644
18 --- a/sys-libs/libcxxabi/Manifest
19 +++ b/sys-libs/libcxxabi/Manifest
20 @@ -3,5 +3,6 @@ DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc
21 DIST llvmorg-11.0.1.tar.gz 122790338 BLAKE2B 0130996b4a8c4d9f757136fd7fb318068c9bfdc565060dec0d4336480c4ab66c4ae3185a7fdb05f13cf9ee8fd4123b09df938881b75d6e5d3689595114b7e32a SHA512 f5e6ef0b3111aae08a89cd01adb2ff4abfa9ef779c68b9190421d0447efd25c2cc00e5aae9f4764805f5fa31434866043d1510ae7389817e28ae53a5442e2fdf
22 DIST llvmorg-11.1.0-rc1.tar.gz 122793491 BLAKE2B f4777455f5903cffea284eaffd872be6c287c6c1ebbd0c4b5b5473f146d7f5476f3551998a58d3e976ab90cde7b0d05db2b3be97f4e8e2c3474755ff38739268 SHA512 44e281486c44fa1611042ab658b9833a75f9613b7f896863613cfb99de66d13607fb1e9064f42ea3d89ca7951113465a90fd96ca4544262f165f78bd5261f5a8
23 DIST llvmorg-11.1.0-rc2.tar.gz 122794772 BLAKE2B ab533f078d9d6c37e27c578866a07896344a0b4cf4ebf6402f4fa490213e017310d1c882bf63e552e99a5b4f6d1d8c01413420713b200bfa6732eff64f3c47a9 SHA512 88d8f1d938f0ba7ec39478d03a35c09a30bea51735276205494265b1061621b3ebcda8ee4211e896783b1b99a377c9fa68046118b0d6cb7fcb7bea1e960f95b7
24 +DIST llvmorg-11.1.0-rc3.tar.gz 122785838 BLAKE2B d0998219471476be1a1249b3a2444750585a352047d4dc14de6fec87eb3407d0f4b848757340200d3423cb4090554ae033fb4ec3797446e46556fbb566bb77a3 SHA512 b67874cb127f3f929a3796558cdfbf509b384c4247f4936ba08cecf88ca880a167cf67c23d78104b5bab4a98efd9435d1b923deb7ae7367875414e6c896957d1
25 DIST llvmorg-12.0.0-rc1.tar.gz 134164708 BLAKE2B d4261ff7d9586b47f4cfda3d2cda4b76534f9e17fbd5cdb8861895b8eb466021962f4608bfcdeb52f8fce78850a994fd5eda0560f7211e5c8d1ac9330a738a36 SHA512 3d07d013d0705bb99f56898cc55d054d0d95aeb53b3c756cfab80b4c9097cc4935bcea89b9efde2e503a899b9fccf0dacc0073c9991c8ea352755c5ec68a757a
26 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
27
28 diff --git a/sys-libs/libcxxabi/libcxxabi-11.1.0_rc3.ebuild b/sys-libs/libcxxabi/libcxxabi-11.1.0_rc3.ebuild
29 new file mode 100644
30 index 00000000000..59511b92f9e
31 --- /dev/null
32 +++ b/sys-libs/libcxxabi/libcxxabi-11.1.0_rc3.ebuild
33 @@ -0,0 +1,123 @@
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=""
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,} )
69 +LLVM_TEST_COMPONENTS=( llvm/cmake )
70 +llvm.org_set_globals
71 +
72 +python_check_deps() {
73 + has_version "dev-python/lit[${PYTHON_USEDEP}]"
74 +}
75 +
76 +pkg_setup() {
77 + # darwin prefix builds do not have llvm installed yet, so rely on bootstrap-prefix
78 + # to set the appropriate path vars to LLVM instead of using llvm_pkg_setup.
79 + if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then
80 + llvm_pkg_setup
81 + fi
82 + use test && python-any-r1_pkg_setup
83 +}
84 +
85 +multilib_src_configure() {
86 + # link against compiler-rt instead of libgcc if we are using clang with libunwind
87 + local want_compiler_rt=OFF
88 + if use libunwind && tc-is-clang; then
89 + local compiler_rt=$($(tc-getCC) ${CFLAGS} ${CPPFLAGS} \
90 + ${LDFLAGS} -print-libgcc-file-name)
91 + if [[ ${compiler_rt} == *libclang_rt* ]]; then
92 + want_compiler_rt=ON
93 + fi
94 + fi
95 +
96 + local libdir=$(get_libdir)
97 + local mycmakeargs=(
98 + -DLIBCXXABI_LIBDIR_SUFFIX=${libdir#lib}
99 + -DLIBCXXABI_ENABLE_SHARED=ON
100 + -DLIBCXXABI_ENABLE_STATIC=$(usex static-libs)
101 + -DLIBCXXABI_USE_LLVM_UNWINDER=$(usex libunwind)
102 + -DLIBCXXABI_INCLUDE_TESTS=$(usex test)
103 + -DLIBCXXABI_USE_COMPILER_RT=${want_compiler_rt}
104 +
105 + -DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}"/libcxx/include
106 + # upstream is omitting standard search path for this
107 + # probably because gcc & clang are bundling their own unwind.h
108 + -DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include
109 + )
110 + if use test; then
111 + local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
112 + [[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
113 +
114 + mycmakeargs+=(
115 + -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
116 + -DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}"
117 + -DPython3_EXECUTABLE="${PYTHON}"
118 + )
119 + fi
120 + cmake_src_configure
121 +}
122 +
123 +build_libcxx() {
124 + local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/$(get_libdir)"
125 + local CMAKE_USE_DIR=${WORKDIR}/libcxx
126 + local BUILD_DIR=${BUILD_DIR}/libcxx
127 + local mycmakeargs=(
128 + -DLIBCXX_LIBDIR_SUFFIX=
129 + -DLIBCXX_ENABLE_SHARED=OFF
130 + -DLIBCXX_ENABLE_STATIC=ON
131 + -DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF
132 + -DLIBCXX_CXX_ABI=libcxxabi
133 + -DLIBCXX_CXX_ABI_INCLUDE_PATHS="${S}"/include
134 + -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
135 + -DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
136 + -DLIBCXX_HAS_GCC_S_LIB=OFF
137 + -DLIBCXX_INCLUDE_TESTS=OFF
138 + )
139 +
140 + cmake_src_configure
141 + cmake_src_compile
142 +}
143 +
144 +multilib_src_test() {
145 + # build a local copy of libc++ for testing to avoid circular dep
146 + build_libcxx
147 + mv "${BUILD_DIR}"/libcxx/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" || die
148 +
149 + local -x LIT_PRESERVES_TMP=1
150 + cmake_build check-cxxabi
151 +}
152 +
153 +multilib_src_install_all() {
154 + insinto /usr/include/libcxxabi
155 + doins -r include/.
156 +}