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, 30 Jul 2020 22:11:39
Message-Id: 1596146996.1bbe2eb68da42c8fbe2b6f07213eb1ebf849e900.mgorny@gentoo
1 commit: 1bbe2eb68da42c8fbe2b6f07213eb1ebf849e900
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jul 29 11:48:29 2020 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Thu Jul 30 22:09:56 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bbe2eb6
7
8 sys-libs/libcxxabi: Remove 8*
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 sys-libs/libcxxabi/Manifest | 2 -
13 sys-libs/libcxxabi/libcxxabi-8.0.1.ebuild | 119 ------------------------------
14 2 files changed, 121 deletions(-)
15
16 diff --git a/sys-libs/libcxxabi/Manifest b/sys-libs/libcxxabi/Manifest
17 index 07b52c69a71..082dafda8ad 100644
18 --- a/sys-libs/libcxxabi/Manifest
19 +++ b/sys-libs/libcxxabi/Manifest
20 @@ -1,5 +1,3 @@
21 -DIST libcxx-8.0.1.src.tar.xz 1739524 BLAKE2B 6e641cb6bda0de12c8408d3ab33f627389ac014aa65b3391c870aa96ffd347784e6b70b953bd1ee8eba56554e0f78a723ab77b9dba5f85e6219e2b95ca50c160 SHA512 75749d08b2b343c6f5f9aefb04be63e42f6d12efc51101d3647ed6f70c7a6d050afb3ab2f3636eae78cb523f5844de67b960a7a3145ed89ab0c7015deb14921e
22 -DIST libcxxabi-8.0.1.src.tar.xz 538356 BLAKE2B 52328c5890c9b9271877b953be30cc39be4758101e6b91ee45f06c81e960089523e80b83eb5c354336e4e0a140f7554640acf7b2d4fa619113f705108a314418 SHA512 577cfcb04ebb29ee84d35ed31aa8fecb28fc74b07ef7ff298f0fe2d440f823def73e092359c41d8d8600e6df18f55224ed89674d403c5ae56a7d7973487b8734
23 DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
24 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
25 DIST llvmorg-11.0.0-rc1.tar.gz 122688246 BLAKE2B 10ff3f08ff3780abb1d86ac67942e6aac52ff5daf820a2e3d23d8b79dbade1c5b1d398d0a577028d2d7c8759ab9a8b552a0305b5750310a015585c06cdadf844 SHA512 09564ed903902a5795fffaa4679badc30bf49739889a48074b5ae2c93bd29000cfb36a650208d5cae5d74899bade066f84b4aa023fc852eec246ff67bf64a267
26
27 diff --git a/sys-libs/libcxxabi/libcxxabi-8.0.1.ebuild b/sys-libs/libcxxabi/libcxxabi-8.0.1.ebuild
28 deleted file mode 100644
29 index 74465117dda..00000000000
30 --- a/sys-libs/libcxxabi/libcxxabi-8.0.1.ebuild
31 +++ /dev/null
32 @@ -1,119 +0,0 @@
33 -# Copyright 1999-2019 Gentoo Authors
34 -# Distributed under the terms of the GNU General Public License v2
35 -
36 -EAPI=6
37 -
38 -: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
39 -# (needed due to CMAKE_BUILD_TYPE != Gentoo)
40 -CMAKE_MIN_VERSION=3.7.0-r1
41 -PYTHON_COMPAT=( python2_7 )
42 -
43 -inherit cmake-multilib llvm multiprocessing python-any-r1
44 -
45 -MY_P=${P/_/}.src
46 -LIBCXX_P=libcxx-${PV/_/}.src
47 -
48 -DESCRIPTION="Low level support for a standard C++ library"
49 -HOMEPAGE="https://libcxxabi.llvm.org/"
50 -SRC_URI="https://github.com/llvm/llvm-project/releases/download/llvmorg-${PV}/${MY_P}.tar.xz
51 - https://github.com/llvm/llvm-project/releases/download/llvmorg-${PV}/${LIBCXX_P}.tar.xz"
52 -
53 -LICENSE="|| ( UoI-NCSA MIT )"
54 -SLOT="0"
55 -KEYWORDS="amd64 arm arm64 x86"
56 -IUSE="+libunwind +static-libs test elibc_musl"
57 -RESTRICT="!test? ( test )"
58 -
59 -RDEPEND="
60 - libunwind? (
61 - || (
62 - >=sys-libs/libunwind-1.0.1-r1[static-libs?,${MULTILIB_USEDEP}]
63 - >=sys-libs/llvm-libunwind-3.9.0-r1[static-libs?,${MULTILIB_USEDEP}]
64 - )
65 - )"
66 -# llvm-6 for new lit options
67 -DEPEND="${RDEPEND}
68 - >=sys-devel/llvm-6
69 - test? ( >=sys-devel/clang-3.9.0
70 - $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )"
71 -
72 -S=${WORKDIR}/${MY_P}
73 -
74 -# least intrusive of all
75 -CMAKE_BUILD_TYPE=RelWithDebInfo
76 -
77 -python_check_deps() {
78 - has_version "dev-python/lit[${PYTHON_USEDEP}]"
79 -}
80 -
81 -pkg_setup() {
82 - llvm_pkg_setup
83 - use test && python-any-r1_pkg_setup
84 -}
85 -
86 -src_unpack() {
87 - default
88 - mv "${LIBCXX_P}" libcxx || die
89 -}
90 -
91 -multilib_src_configure() {
92 - local libdir=$(get_libdir)
93 - local mycmakeargs=(
94 - -DLIBCXXABI_LIBDIR_SUFFIX=${libdir#lib}
95 - -DLIBCXXABI_ENABLE_SHARED=ON
96 - -DLIBCXXABI_ENABLE_STATIC=$(usex static-libs)
97 - -DLIBCXXABI_USE_LLVM_UNWINDER=$(usex libunwind)
98 - -DLIBCXXABI_INCLUDE_TESTS=$(usex test)
99 -
100 - -DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}"/libcxx/include
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 - )
105 - if use test; then
106 - local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
107 - local jobs=${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}
108 -
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="-vv;-j;${jobs};--param=cxx_under_test=${clang_path}"
114 - )
115 - fi
116 - cmake-utils_src_configure
117 -}
118 -
119 -build_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=ON
126 - -DLIBCXX_ENABLE_STATIC=OFF
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 - )
135 -
136 - cmake-utils_src_configure
137 - cmake-utils_src_compile
138 -}
139 -
140 -multilib_src_test() {
141 - # build a local copy of libc++ for testing to avoid circular dep
142 - build_libcxx
143 - mv "${BUILD_DIR}"/libcxx/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" || die
144 -
145 - cmake-utils_src_make check-libcxxabi
146 -}
147 -
148 -multilib_src_install_all() {
149 - insinto /usr/include/libcxxabi
150 - doins -r include/.
151 -}