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: Sun, 29 Nov 2020 08:26:13
Message-Id: 1606638355.fa8fca73526adc4faceaa157c68fa080eb5b5417.mgorny@gentoo
1 commit: fa8fca73526adc4faceaa157c68fa080eb5b5417
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sun Nov 29 08:23:21 2020 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sun Nov 29 08:25:55 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa8fca73
7
8 sys-libs/libcxxabi: Remove 10.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-10.0.0.ebuild | 119 -----------------------------
14 2 files changed, 120 deletions(-)
15
16 diff --git a/sys-libs/libcxxabi/Manifest b/sys-libs/libcxxabi/Manifest
17 index 52eb105e0cf..11ed9f91a47 100644
18 --- a/sys-libs/libcxxabi/Manifest
19 +++ b/sys-libs/libcxxabi/Manifest
20 @@ -1,4 +1,3 @@
21 -DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
22 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
23 DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984 SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2
24 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
25
26 diff --git a/sys-libs/libcxxabi/libcxxabi-10.0.0.ebuild b/sys-libs/libcxxabi/libcxxabi-10.0.0.ebuild
27 deleted file mode 100644
28 index 0812b96e62d..00000000000
29 --- a/sys-libs/libcxxabi/libcxxabi-10.0.0.ebuild
30 +++ /dev/null
31 @@ -1,119 +0,0 @@
32 -# Copyright 1999-2020 Gentoo Authors
33 -# Distributed under the terms of the GNU General Public License v2
34 -
35 -EAPI=7
36 -
37 -PYTHON_COMPAT=( python3_{6,7} )
38 -inherit cmake-multilib llvm llvm.org multiprocessing python-any-r1 toolchain-funcs
39 -
40 -DESCRIPTION="Low level support for a standard C++ library"
41 -HOMEPAGE="https://libcxxabi.llvm.org/"
42 -# libcxx is needed uncondtionally for the headers
43 -LLVM_COMPONENTS=( libcxx{abi,} )
44 -llvm.org_set_globals
45 -
46 -LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
47 -SLOT="0"
48 -KEYWORDS="amd64 arm arm64 x86"
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 -# least intrusive of all
67 -CMAKE_BUILD_TYPE=RelWithDebInfo
68 -
69 -python_check_deps() {
70 - has_version "dev-python/lit[${PYTHON_USEDEP}]"
71 -}
72 -
73 -pkg_setup() {
74 - llvm_pkg_setup
75 - use test && python-any-r1_pkg_setup
76 -}
77 -
78 -multilib_src_configure() {
79 - # link against compiler-rt instead of libgcc if we are using clang with libunwind
80 - local want_compiler_rt=OFF
81 - if use libunwind && tc-is-clang; then
82 - local compiler_rt=$($(tc-getCC) ${CFLAGS} ${CPPFLAGS} \
83 - ${LDFLAGS} -print-libgcc-file-name)
84 - if [[ ${compiler_rt} == *libclang_rt* ]]; then
85 - want_compiler_rt=ON
86 - fi
87 - fi
88 -
89 - local libdir=$(get_libdir)
90 - local mycmakeargs=(
91 - -DLIBCXXABI_LIBDIR_SUFFIX=${libdir#lib}
92 - -DLIBCXXABI_ENABLE_SHARED=ON
93 - -DLIBCXXABI_ENABLE_STATIC=$(usex static-libs)
94 - -DLIBCXXABI_USE_LLVM_UNWINDER=$(usex libunwind)
95 - -DLIBCXXABI_INCLUDE_TESTS=$(usex test)
96 - -DLIBCXXABI_USE_COMPILER_RT=${want_compiler_rt}
97 -
98 - -DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}"/libcxx/include
99 - # upstream is omitting standard search path for this
100 - # probably because gcc & clang are bundling their own unwind.h
101 - -DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include
102 - )
103 - if use test; then
104 - local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
105 - local jobs=${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}
106 -
107 - [[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
108 -
109 - mycmakeargs+=(
110 - -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
111 - -DLLVM_LIT_ARGS="-vv;-j;${jobs};--param=cxx_under_test=${clang_path}"
112 - )
113 - fi
114 - cmake-utils_src_configure
115 -}
116 -
117 -build_libcxx() {
118 - local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/$(get_libdir)"
119 - local CMAKE_USE_DIR=${WORKDIR}/libcxx
120 - local BUILD_DIR=${BUILD_DIR}/libcxx
121 - local mycmakeargs=(
122 - -DLIBCXX_LIBDIR_SUFFIX=
123 - -DLIBCXX_ENABLE_SHARED=OFF
124 - -DLIBCXX_ENABLE_STATIC=ON
125 - -DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF
126 - -DLIBCXX_CXX_ABI=libcxxabi
127 - -DLIBCXX_CXX_ABI_INCLUDE_PATHS="${S}"/include
128 - -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
129 - -DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
130 - -DLIBCXX_HAS_GCC_S_LIB=OFF
131 - -DLIBCXX_INCLUDE_TESTS=OFF
132 - )
133 -
134 - cmake-utils_src_configure
135 - cmake-utils_src_compile
136 -}
137 -
138 -multilib_src_test() {
139 - # build a local copy of libc++ for testing to avoid circular dep
140 - build_libcxx
141 - mv "${BUILD_DIR}"/libcxx/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" || die
142 -
143 - local -x LIT_PRESERVES_TMP=1
144 - cmake-utils_src_make check-libcxxabi
145 -}
146 -
147 -multilib_src_install_all() {
148 - insinto /usr/include/libcxxabi
149 - doins -r include/.
150 -}