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/llvm-libunwind/
Date: Wed, 02 Feb 2022 21:16:41
Message-Id: 1643836578.4c86688fcdf71b7991341781377dcc5f626eb509.mgorny@gentoo
1 commit: 4c86688fcdf71b7991341781377dcc5f626eb509
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed Feb 2 16:45:04 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed Feb 2 21:16:18 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c86688f
7
8 sys-libs/llvm-libunwind: Remove 13.0.1_rc3
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 sys-libs/llvm-libunwind/Manifest | 1 -
13 .../llvm-libunwind-13.0.1_rc3.ebuild | 142 ---------------------
14 2 files changed, 143 deletions(-)
15
16 diff --git a/sys-libs/llvm-libunwind/Manifest b/sys-libs/llvm-libunwind/Manifest
17 index f664413e3e0c..7998138e392b 100644
18 --- a/sys-libs/llvm-libunwind/Manifest
19 +++ b/sys-libs/llvm-libunwind/Manifest
20 @@ -2,5 +2,4 @@ DIST llvm-gentoo-patchset-13.0.1.tar.xz 6288 BLAKE2B 899222b962486e924e4f8a2b574
21 DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
22 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
23 DIST llvmorg-13.0.0.tar.gz 147270176 BLAKE2B 628f316b580e1edf3a58d4825b724df759e6ed2a4116802470c04562caefc392fa325c91f388036365a2e45a9595cca6d3557fab12984fc8bcfef29c9116d822 SHA512 8004c05d32b9720fb3391783621690c1df9bd1e97e72cbff9192ed88a84b0acd303b61432145fa917b5b5e548c8cee29b24ef8547dcc8677adf4816e7a8a0eb2
24 -DIST llvmorg-13.0.1-rc3.tar.gz 147302323 BLAKE2B 9ac2f97568062d7dd618295a68d6e14898fcd69e2bb66290b999ceb8c12132371f4e9b59d8ba2b252e5e5cb249045676b24fc50c117b2afae20abab98f426582 SHA512 88a04ad02af2d41ec21c7a62bad21ee0e627b7276a16795875afd062ed29ac7fb4aadec5b5e48785a6502c9fd797a4b67d648a21f193c9f7602112870b10a3d1
25 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
26
27 diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-13.0.1_rc3.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-13.0.1_rc3.ebuild
28 deleted file mode 100644
29 index bc5a62c6434a..000000000000
30 --- a/sys-libs/llvm-libunwind/llvm-libunwind-13.0.1_rc3.ebuild
31 +++ /dev/null
32 @@ -1,142 +0,0 @@
33 -# Copyright 1999-2022 Gentoo Authors
34 -# Distributed under the terms of the GNU General Public License v2
35 -
36 -EAPI=7
37 -
38 -CMAKE_ECLASS=cmake
39 -PYTHON_COMPAT=( python3_{8..10} )
40 -inherit cmake-multilib llvm llvm.org python-any-r1 toolchain-funcs
41 -
42 -DESCRIPTION="C++ runtime stack unwinder from LLVM"
43 -HOMEPAGE="https://github.com/llvm-mirror/libunwind"
44 -
45 -LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
46 -SLOT="0"
47 -KEYWORDS=""
48 -IUSE="debug static-libs test"
49 -RESTRICT="!test? ( test )"
50 -
51 -RDEPEND="!sys-libs/libunwind"
52 -# llvm-6 for new lit options
53 -DEPEND="
54 - >=sys-devel/llvm-6"
55 -BDEPEND="
56 - test? ( >=sys-devel/clang-3.9.0
57 - $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
58 - )"
59 -
60 -LLVM_COMPONENTS=( libunwind libcxx llvm/cmake )
61 -LLVM_TEST_COMPONENTS=( libcxxabi )
62 -llvm.org_set_globals
63 -
64 -python_check_deps() {
65 - has_version "dev-python/lit[${PYTHON_USEDEP}]"
66 -}
67 -
68 -pkg_setup() {
69 - use test && python-any-r1_pkg_setup
70 -}
71 -
72 -multilib_src_configure() {
73 - local use_compiler_rt=OFF
74 - local libdir=$(get_libdir)
75 -
76 - # link to compiler-rt
77 - # https://github.com/gentoo/gentoo/pull/21516
78 - if tc-is-clang; then
79 - local compiler_rt=$($(tc-getCC) ${CFLAGS} ${CPPFLAGS} \
80 - ${LD_FLAGS} -print-libgcc-file-name)
81 - if [[ ${compiler_rt} == *libclang_rt* ]]; then
82 - use_compiler_rt=ON
83 - fi
84 - fi
85 -
86 - local mycmakeargs=(
87 - -DLLVM_LIBDIR_SUFFIX=${libdir#lib}
88 - -DLIBUNWIND_ENABLE_ASSERTIONS=$(usex debug)
89 - -DLIBUNWIND_ENABLE_STATIC=$(usex static-libs)
90 - -DLIBUNWIND_TARGET_TRIPLE="${CHOST}"
91 - -DLLVM_INCLUDE_TESTS=$(usex test)
92 -
93 - # support non-native unwinding; given it's small enough,
94 - # enable it unconditionally
95 - -DLIBUNWIND_ENABLE_CROSS_UNWINDING=ON
96 -
97 - # avoid dependency on libgcc_s if compiler-rt is used
98 - -DLIBUNWIND_USE_COMPILER_RT=${use_compiler_rt}
99 - )
100 - if use test; then
101 - local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
102 - [[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
103 -
104 - mycmakeargs+=(
105 - -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
106 - -DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}"
107 - -DLIBUNWIND_LIBCXX_PATH="${WORKDIR}/libcxx"
108 - )
109 - fi
110 -
111 - cmake_src_configure
112 -}
113 -
114 -wrap_libcxxabi() {
115 - local mycmakeargs=(
116 - -DLIBCXXABI_LIBDIR_SUFFIX=
117 - -DLIBCXXABI_ENABLE_SHARED=OFF
118 - -DLIBCXXABI_ENABLE_STATIC=ON
119 - -DLIBCXXABI_USE_LLVM_UNWINDER=ON
120 - -DLIBCXXABI_INCLUDE_TESTS=OFF
121 -
122 - -DLIBCXXABI_LIBCXX_INCLUDES="${BUILD_DIR}"/libcxx/include/c++/v1
123 - -DLIBCXXABI_LIBUNWIND_INCLUDES="${S}"/include
124 - )
125 -
126 - local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/$(get_libdir)"
127 - local CMAKE_USE_DIR=${WORKDIR}/libcxxabi
128 - local BUILD_DIR=${BUILD_DIR}/libcxxabi
129 -
130 - "${@}"
131 -}
132 -
133 -wrap_libcxx() {
134 - local mycmakeargs=(
135 - -DLIBCXX_LIBDIR_SUFFIX=
136 - -DLIBCXX_ENABLE_SHARED=OFF
137 - -DLIBCXX_ENABLE_STATIC=ON
138 - -DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF
139 - -DLIBCXXABI_USE_LLVM_UNWINDER=ON
140 - -DLIBCXX_CXX_ABI=libcxxabi
141 - -DLIBCXX_CXX_ABI_INCLUDE_PATHS="${WORKDIR}"/libcxxabi/include
142 - -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
143 - -DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
144 - -DLIBCXX_HAS_GCC_S_LIB=OFF
145 - -DLIBCXX_INCLUDE_TESTS=OFF
146 - )
147 -
148 - local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/libcxxabi/lib -L${BUILD_DIR}/$(get_libdir)"
149 - local CMAKE_USE_DIR=${WORKDIR}/libcxx
150 - local BUILD_DIR=${BUILD_DIR}/libcxx
151 -
152 - "${@}"
153 -}
154 -
155 -multilib_src_test() {
156 - # build local copies of libc++ & libc++abi for testing to avoid
157 - # circular deps
158 - wrap_libcxx cmake_src_configure
159 - wrap_libcxx cmake_build generate-cxx-headers
160 - wrap_libcxxabi cmake_src_configure
161 - wrap_libcxxabi cmake_src_compile
162 - wrap_libcxx cmake_src_compile
163 - mv "${BUILD_DIR}"/libcxx*/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" || die
164 -
165 - local -x LIT_PRESERVES_TMP=1
166 - cmake_build check-unwind
167 -}
168 -
169 -multilib_src_install() {
170 - cmake_src_install
171 -
172 - # install headers like sys-libs/libunwind
173 - doheader "${S}"/include/*.h
174 -}