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: Sat, 11 Sep 2021 07:26:02
Message-Id: 1631345115.ecb0f612eb0fa9e8e88ad98b3ae33fe979ebeda2.mgorny@gentoo
1 commit: ecb0f612eb0fa9e8e88ad98b3ae33fe979ebeda2
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sat Sep 11 07:25:15 2021 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sat Sep 11 07:25:15 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecb0f612
7
8 sys-libs/llvm-libunwind: Remove 13.0.0_rc1
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.0_rc1.ebuild | 141 ---------------------
14 2 files changed, 142 deletions(-)
15
16 diff --git a/sys-libs/llvm-libunwind/Manifest b/sys-libs/llvm-libunwind/Manifest
17 index e8e78e47c69..3b45de6a465 100644
18 --- a/sys-libs/llvm-libunwind/Manifest
19 +++ b/sys-libs/llvm-libunwind/Manifest
20 @@ -1,5 +1,4 @@
21 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
22 DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
23 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
24 -DIST llvmorg-13.0.0-rc1.tar.gz 147235597 BLAKE2B 089fed119dee8a16f278cebb13808bd5a95629cc87ebee3050225cc041b78fee51acacc5bcc913d4a99e830bfe5774b19a04a845293c5087dd2a8c9d94d2fde9 SHA512 6e307e2c2dcb7ff41d11ee29d69f41c0ef55f200999847a3a924a2e773fc9c2160015746789af8b723c628bd232f97fce63370209bd0065491d80b0cc0017e85
25 DIST llvmorg-13.0.0-rc2.tar.gz 147267736 BLAKE2B 153bf7320f2aa911112d366ffc79f7110cb04f135c2a8b176c263f0a75eb768206d9bd462893d45504b0e58aa9e127fdcafb02300eab1666e4616aa654d457dd SHA512 a01baf3eaa02f02af42bfcf6dcf24f166351bf1c09601495617c81e41def23210573bad40a344270f40c5deb881d06863536abac2a6481930766a6a56335fb44
26
27 diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-13.0.0_rc1.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-13.0.0_rc1.ebuild
28 deleted file mode 100644
29 index a4b1aceef51..00000000000
30 --- a/sys-libs/llvm-libunwind/llvm-libunwind-13.0.0_rc1.ebuild
31 +++ /dev/null
32 @@ -1,141 +0,0 @@
33 -# Copyright 1999-2021 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 - -DLLVM_INCLUDE_TESTS=$(usex test)
91 -
92 - # support non-native unwinding; given it's small enough,
93 - # enable it unconditionally
94 - -DLIBUNWIND_ENABLE_CROSS_UNWINDING=ON
95 -
96 - # avoid dependency on libgcc_s if compiler-rt is used
97 - -DLIBUNWIND_USE_COMPILER_RT=${use_compiler_rt}
98 - )
99 - if use test; then
100 - local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
101 - [[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
102 -
103 - mycmakeargs+=(
104 - -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
105 - -DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}"
106 - -DLIBUNWIND_LIBCXX_PATH="${WORKDIR}/libcxx"
107 - )
108 - fi
109 -
110 - cmake_src_configure
111 -}
112 -
113 -wrap_libcxxabi() {
114 - local mycmakeargs=(
115 - -DLIBCXXABI_LIBDIR_SUFFIX=
116 - -DLIBCXXABI_ENABLE_SHARED=OFF
117 - -DLIBCXXABI_ENABLE_STATIC=ONF
118 - -DLIBCXXABI_USE_LLVM_UNWINDER=ON
119 - -DLIBCXXABI_INCLUDE_TESTS=OFF
120 -
121 - -DLIBCXXABI_LIBCXX_INCLUDES="${BUILD_DIR}"/libcxx/include/c++/v1
122 - -DLIBCXXABI_LIBUNWIND_INCLUDES="${S}"/include
123 - )
124 -
125 - local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/$(get_libdir)"
126 - local CMAKE_USE_DIR=${WORKDIR}/libcxxabi
127 - local BUILD_DIR=${BUILD_DIR}/libcxxabi
128 -
129 - "${@}"
130 -}
131 -
132 -wrap_libcxx() {
133 - local mycmakeargs=(
134 - -DLIBCXX_LIBDIR_SUFFIX=
135 - -DLIBCXX_ENABLE_SHARED=OFF
136 - -DLIBCXX_ENABLE_STATIC=ON
137 - -DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF
138 - -DLIBCXXABI_USE_LLVM_UNWINDER=ON
139 - -DLIBCXX_CXX_ABI=libcxxabi
140 - -DLIBCXX_CXX_ABI_INCLUDE_PATHS="${WORKDIR}"/libcxxabi/include
141 - -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
142 - -DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
143 - -DLIBCXX_HAS_GCC_S_LIB=OFF
144 - -DLIBCXX_INCLUDE_TESTS=OFF
145 - )
146 -
147 - local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/libcxxabi/lib -L${BUILD_DIR}/$(get_libdir)"
148 - local CMAKE_USE_DIR=${WORKDIR}/libcxx
149 - local BUILD_DIR=${BUILD_DIR}/libcxx
150 -
151 - "${@}"
152 -}
153 -
154 -multilib_src_test() {
155 - # build local copies of libc++ & libc++abi for testing to avoid
156 - # circular deps
157 - wrap_libcxx cmake_src_configure
158 - wrap_libcxx cmake_build generate-cxx-headers
159 - wrap_libcxxabi cmake_src_configure
160 - wrap_libcxxabi cmake_src_compile
161 - wrap_libcxx cmake_src_compile
162 - mv "${BUILD_DIR}"/libcxx*/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" || die
163 -
164 - local -x LIT_PRESERVES_TMP=1
165 - cmake_build check-unwind
166 -}
167 -
168 -multilib_src_install() {
169 - cmake_src_install
170 -
171 - # install headers like sys-libs/libunwind
172 - doheader "${S}"/include/*.h
173 -}