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: Fri, 01 May 2020 08:54:11
Message-Id: 1588323220.900b4b454e1eb002f07a08408f370a49b826fff9.mgorny@gentoo
1 commit: 900b4b454e1eb002f07a08408f370a49b826fff9
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Fri May 1 08:46:43 2020 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Fri May 1 08:53:40 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=900b4b45
7
8 sys-libs/libcxxabi: Remove 7*
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 sys-libs/libcxxabi/Manifest | 2 -
13 sys-libs/libcxxabi/libcxxabi-7.1.0.ebuild | 119 ------------------------------
14 2 files changed, 121 deletions(-)
15
16 diff --git a/sys-libs/libcxxabi/Manifest b/sys-libs/libcxxabi/Manifest
17 index 18a6dc01f9b..f0cdbbf9d21 100644
18 --- a/sys-libs/libcxxabi/Manifest
19 +++ b/sys-libs/libcxxabi/Manifest
20 @@ -1,6 +1,4 @@
21 -DIST libcxx-7.1.0.src.tar.xz 1638448 BLAKE2B eca192e03f839f4323e3c37beba2e6daaf935d4e784e0bc835a4d2c3ce0790f5539bdca0466feafd668d7c6675b11b7fe14d9adb680c46fd7b28b42a3b423219 SHA512 925ce5093445f84dc17d5b1610e4297ef3606b254b7350c50f88ba042fcca62125ffd97d21cb612707d5e9511267634ca1779619199f95ce819e5f5c0c2b55d5
22 DIST libcxx-8.0.1.src.tar.xz 1739524 BLAKE2B 6e641cb6bda0de12c8408d3ab33f627389ac014aa65b3391c870aa96ffd347784e6b70b953bd1ee8eba56554e0f78a723ab77b9dba5f85e6219e2b95ca50c160 SHA512 75749d08b2b343c6f5f9aefb04be63e42f6d12efc51101d3647ed6f70c7a6d050afb3ab2f3636eae78cb523f5844de67b960a7a3145ed89ab0c7015deb14921e
23 -DIST libcxxabi-7.1.0.src.tar.xz 535180 BLAKE2B aa5952e3ca80f7ce2a0a79f3eaf3852234e23a8445a2539374bedb188aba7d973763a6c0d7cc7700070d942555250f87c3c9efb504bb731985be033d47b79b44 SHA512 629ef641ab5aba28ea7171efbad806f1f0464eee2d04f8903014a4f82c03f2c6513defbbe5489b2c6fd624270fe8efbad97a40e56958f8f38a4f5516a16dd102
24 DIST libcxxabi-8.0.1.src.tar.xz 538356 BLAKE2B 52328c5890c9b9271877b953be30cc39be4758101e6b91ee45f06c81e960089523e80b83eb5c354336e4e0a140f7554640acf7b2d4fa619113f705108a314418 SHA512 577cfcb04ebb29ee84d35ed31aa8fecb28fc74b07ef7ff298f0fe2d440f823def73e092359c41d8d8600e6df18f55224ed89674d403c5ae56a7d7973487b8734
25 DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
26 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
27
28 diff --git a/sys-libs/libcxxabi/libcxxabi-7.1.0.ebuild b/sys-libs/libcxxabi/libcxxabi-7.1.0.ebuild
29 deleted file mode 100644
30 index d6df9441743..00000000000
31 --- a/sys-libs/libcxxabi/libcxxabi-7.1.0.ebuild
32 +++ /dev/null
33 @@ -1,119 +0,0 @@
34 -# Copyright 1999-2019 Gentoo Authors
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI=6
38 -
39 -: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
40 -# (needed due to CMAKE_BUILD_TYPE != Gentoo)
41 -CMAKE_MIN_VERSION=3.7.0-r1
42 -PYTHON_COMPAT=( python2_7 )
43 -
44 -inherit cmake-multilib llvm multiprocessing python-any-r1
45 -
46 -MY_P=${P/_/}.src
47 -LIBCXX_P=libcxx-${PV/_/}.src
48 -
49 -DESCRIPTION="Low level support for a standard C++ library"
50 -HOMEPAGE="https://libcxxabi.llvm.org/"
51 -SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz
52 - https://releases.llvm.org/${PV/_//}/${LIBCXX_P}.tar.xz"
53 -
54 -LICENSE="|| ( UoI-NCSA MIT )"
55 -SLOT="0"
56 -KEYWORDS="amd64 arm arm64 x86"
57 -IUSE="+libunwind +static-libs test elibc_musl"
58 -RESTRICT="!test? ( test )"
59 -
60 -RDEPEND="
61 - libunwind? (
62 - || (
63 - >=sys-libs/libunwind-1.0.1-r1[static-libs?,${MULTILIB_USEDEP}]
64 - >=sys-libs/llvm-libunwind-3.9.0-r1[static-libs?,${MULTILIB_USEDEP}]
65 - )
66 - )"
67 -# llvm-6 for new lit options
68 -DEPEND="${RDEPEND}
69 - >=sys-devel/llvm-6
70 - test? ( >=sys-devel/clang-3.9.0
71 - $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )"
72 -
73 -S=${WORKDIR}/${MY_P}
74 -
75 -# least intrusive of all
76 -CMAKE_BUILD_TYPE=RelWithDebInfo
77 -
78 -python_check_deps() {
79 - has_version "dev-python/lit[${PYTHON_USEDEP}]"
80 -}
81 -
82 -pkg_setup() {
83 - llvm_pkg_setup
84 - use test && python-any-r1_pkg_setup
85 -}
86 -
87 -src_unpack() {
88 - default
89 - mv "${LIBCXX_P}" libcxx || die
90 -}
91 -
92 -multilib_src_configure() {
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 -
101 - -DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}"/libcxx/include
102 - # upstream is omitting standard search path for this
103 - # probably because gcc & clang are bundling their own unwind.h
104 - -DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include
105 - )
106 - if use test; then
107 - local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
108 - local jobs=${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}
109 -
110 - [[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
111 -
112 - mycmakeargs+=(
113 - -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
114 - -DLLVM_LIT_ARGS="-vv;-j;${jobs};--param=cxx_under_test=${clang_path}"
115 - )
116 - fi
117 - cmake-utils_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=ON
127 - -DLIBCXX_ENABLE_STATIC=OFF
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-utils_src_configure
138 - cmake-utils_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 - cmake-utils_src_make check-libcxxabi
147 -}
148 -
149 -multilib_src_install_all() {
150 - insinto /usr/include/libcxxabi
151 - doins -r include/.
152 -}