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: Wed, 01 Feb 2023 05:15:28
Message-Id: 1675228285.cd459d6105fa93de11199eb2d8f83368cb2bb3eb.mgorny@gentoo
1 commit: cd459d6105fa93de11199eb2d8f83368cb2bb3eb
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed Feb 1 05:11:25 2023 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed Feb 1 05:11:25 2023 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd459d61
7
8 sys-libs/libcxxabi: Remove 13.x
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 sys-libs/libcxxabi/Manifest | 1 -
13 sys-libs/libcxxabi/libcxxabi-13.0.1.ebuild | 120 -----------------------------
14 2 files changed, 121 deletions(-)
15
16 diff --git a/sys-libs/libcxxabi/Manifest b/sys-libs/libcxxabi/Manifest
17 index 854f3e11851b..53407e02853b 100644
18 --- a/sys-libs/libcxxabi/Manifest
19 +++ b/sys-libs/libcxxabi/Manifest
20 @@ -6,4 +6,3 @@ DIST llvm-project-16.0.0rc1.src.tar.xz 118364920 BLAKE2B 449fa321722e77d1a595d0f
21 DIST llvm-project-16.0.0rc1.src.tar.xz.sig 566 BLAKE2B 29a593f74b05ef6268f0b2ee5ebd810a244e7c6b27dd94f709b22bca8e6c8367f8321a6ec61f85476cd399f31519ac2a3c978014afae29490c1e70d26eb6c35f SHA512 dcca03d41ee3cc7d5b150184b03eb9f2e579603ce9cd5289360d1ca47169174afc26a85079cf096ec91e23f487f0b38bb6cd5fb7e5197530582155b16a5ce748
22 DIST llvm-project-46d5a57801bc37e5ebb1a4d6b2acc0fa99c01e8d.tar.gz 180436731 BLAKE2B 51c30c3f11dd55a225b8ebe4ded752ce9e8eb58751e7458c29901dbdd3673f94892d337d111d696e779e3f7ef0bca6c7d79709e2072a4bf3a001d8813125d571 SHA512 ebbe0f8becac39d63433dcc3de474c40f1215fc8faab94fa2ba869d28e66b27e4fe088377bd7ae64575a6d7b07017b88bf92e5488a3185a753e647d8da352bbf
23 DIST llvm-project-6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz 175208511 BLAKE2B cf87cf7e9bf7c74aab8ccda0f153369cb81798047fdd48025c3c7030857b128babbaafb667385a5c8e9916e16038b14fee39f1623d329471e73c39c2f2d7bbfa SHA512 e6dc0cacd6c079be8a00364e4c244782d764d9a8d514d65f9078427cb4a0c1663ff88761bfbc1e955a1a990451439110497c2cb7af7f56b2c91f2e9db4389894
24 -DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
25
26 diff --git a/sys-libs/libcxxabi/libcxxabi-13.0.1.ebuild b/sys-libs/libcxxabi/libcxxabi-13.0.1.ebuild
27 deleted file mode 100644
28 index 2949894d3fac..000000000000
29 --- a/sys-libs/libcxxabi/libcxxabi-13.0.1.ebuild
30 +++ /dev/null
31 @@ -1,120 +0,0 @@
32 -# Copyright 1999-2023 Gentoo Authors
33 -# Distributed under the terms of the GNU General Public License v2
34 -
35 -EAPI=7
36 -
37 -PYTHON_COMPAT=( python3_{9..10} )
38 -inherit cmake-multilib llvm llvm.org python-any-r1 toolchain-funcs
39 -
40 -DESCRIPTION="Low level support for a standard C++ library"
41 -HOMEPAGE="https://libcxxabi.llvm.org/"
42 -
43 -LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
44 -SLOT="0"
45 -KEYWORDS="amd64 arm arm64 ~riscv x86 ~x64-macos"
46 -IUSE="+libunwind static-libs test"
47 -RESTRICT="!test? ( test )"
48 -
49 -RDEPEND="
50 - libunwind? (
51 - || (
52 - >=sys-libs/libunwind-1.0.1-r1[static-libs?,${MULTILIB_USEDEP}]
53 - >=sys-libs/llvm-libunwind-3.9.0-r1[static-libs?,${MULTILIB_USEDEP}]
54 - )
55 - )"
56 -# llvm-6 for new lit options
57 -DEPEND="${RDEPEND}
58 - >=sys-devel/llvm-6"
59 -BDEPEND="
60 - test? ( >=sys-devel/clang-3.9.0
61 - $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
62 - )"
63 -
64 -LLVM_COMPONENTS=( libcxx{abi,} llvm/cmake )
65 -llvm.org_set_globals
66 -
67 -python_check_deps() {
68 - python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
69 -}
70 -
71 -pkg_setup() {
72 - # darwin prefix builds do not have llvm installed yet, so rely on bootstrap-prefix
73 - # to set the appropriate path vars to LLVM instead of using llvm_pkg_setup.
74 - if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then
75 - llvm_pkg_setup
76 - fi
77 - use test && python-any-r1_pkg_setup
78 -}
79 -
80 -multilib_src_configure() {
81 - # we need a configured libc++ for __config_site
82 - wrap_libcxx cmake_src_configure
83 - wrap_libcxx cmake_build generate-cxx-headers
84 -
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-get-c-rtlib) == compiler-rt ]]; then
88 - want_compiler_rt=ON
89 - fi
90 -
91 - local libdir=$(get_libdir)
92 - local mycmakeargs=(
93 - -DLIBCXXABI_LIBDIR_SUFFIX=${libdir#lib}
94 - -DLIBCXXABI_ENABLE_SHARED=ON
95 - -DLIBCXXABI_ENABLE_STATIC=$(usex static-libs)
96 - -DLIBCXXABI_USE_LLVM_UNWINDER=$(usex libunwind)
97 - -DLIBCXXABI_INCLUDE_TESTS=$(usex test)
98 - -DLIBCXXABI_USE_COMPILER_RT=${want_compiler_rt}
99 -
100 - -DLIBCXXABI_LIBCXX_INCLUDES="${BUILD_DIR}"/libcxx/include/c++/v1
101 - # upstream is omitting standard search path for this
102 - # probably because gcc & clang are bundling their own unwind.h
103 - -DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include
104 - -DLIBCXXABI_TARGET_TRIPLE="${CHOST}"
105 - )
106 - if use test; then
107 - local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
108 - [[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
109 -
110 - mycmakeargs+=(
111 - -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
112 - -DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}"
113 - -DPython3_EXECUTABLE="${PYTHON}"
114 - )
115 - fi
116 - cmake_src_configure
117 -}
118 -
119 -wrap_libcxx() {
120 - local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/$(get_libdir)"
121 - local CMAKE_USE_DIR=${WORKDIR}/libcxx
122 - local BUILD_DIR=${BUILD_DIR}/libcxx
123 - local mycmakeargs=(
124 - -DLIBCXX_LIBDIR_SUFFIX=
125 - -DLIBCXX_ENABLE_SHARED=OFF
126 - -DLIBCXX_ENABLE_STATIC=ON
127 - -DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF
128 - -DLIBCXX_CXX_ABI=libcxxabi
129 - -DLIBCXX_CXX_ABI_INCLUDE_PATHS="${S}"/include
130 - -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
131 - -DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
132 - -DLIBCXX_HAS_GCC_S_LIB=OFF
133 - -DLIBCXX_INCLUDE_TESTS=OFF
134 - -DLIBCXX_TARGET_TRIPLE="${CHOST}"
135 - )
136 -
137 - "${@}"
138 -}
139 -
140 -multilib_src_test() {
141 - wrap_libcxx cmake_src_compile
142 - mv "${BUILD_DIR}"/libcxx/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" || die
143 -
144 - local -x LIT_PRESERVES_TMP=1
145 - cmake_build check-cxxabi
146 -}
147 -
148 -multilib_src_install_all() {
149 - insinto /usr/include/libcxxabi
150 - doins -r include/.
151 -}