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, 04 Mar 2020 18:39:19
Message-Id: 1583347143.5acbdbed7a9ffd21db41358461c221abf8aaa1b2.mgorny@gentoo
1 commit: 5acbdbed7a9ffd21db41358461c221abf8aaa1b2
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed Mar 4 18:12:55 2020 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed Mar 4 18:39:03 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5acbdbed
7
8 sys-libs/llvm-libunwind: Remove 10.0.0rc[12]
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 sys-libs/llvm-libunwind/Manifest | 2 -
13 .../llvm-libunwind-10.0.0_rc1.ebuild | 126 ---------------------
14 .../llvm-libunwind-10.0.0_rc2.ebuild | 126 ---------------------
15 3 files changed, 254 deletions(-)
16
17 diff --git a/sys-libs/llvm-libunwind/Manifest b/sys-libs/llvm-libunwind/Manifest
18 index c98784b85fa..e13440932c0 100644
19 --- a/sys-libs/llvm-libunwind/Manifest
20 +++ b/sys-libs/llvm-libunwind/Manifest
21 @@ -4,7 +4,5 @@ DIST libcxxabi-7.1.0.src.tar.xz 535180 BLAKE2B aa5952e3ca80f7ce2a0a79f3eaf385223
22 DIST libcxxabi-8.0.1.src.tar.xz 538356 BLAKE2B 52328c5890c9b9271877b953be30cc39be4758101e6b91ee45f06c81e960089523e80b83eb5c354336e4e0a140f7554640acf7b2d4fa619113f705108a314418 SHA512 577cfcb04ebb29ee84d35ed31aa8fecb28fc74b07ef7ff298f0fe2d440f823def73e092359c41d8d8600e6df18f55224ed89674d403c5ae56a7d7973487b8734
23 DIST libunwind-7.1.0.src.tar.xz 79780 BLAKE2B 8f15dcf4a9c8cb45f17c72bf058eed13a6cd52842ee8630781c3104be77d9a868e241eafd34a31b23aeff18dc49743dd5a566ce4cb866a170f1d09899584e2dd SHA512 8ebfeb821013167e866986a2f9cc6459e43d82f73560a15ee7e0d604a974e1c656f824c9f7ccb47da4b4830ad9a99c663961bdf7642cd105e666b8a8fdf7d03c
24 DIST libunwind-8.0.1.src.tar.xz 87188 BLAKE2B 26f4d8ffbc8eb316e4e623280d6fe493e4c5c29489b90633c8215fe91349de7f7f0cfbfe8991ace11656d3782e13c7208b4a4adc04691746b4140187fba40043 SHA512 c115582ca879e215b97d24e4aa80696796383e79856cf26e40b4ddd6b255d598f9fa9867b30f0fd1691be770779835ac1d4b9a5e4a71424b18499b79ea37d060
25 -DIST llvmorg-10.0.0-rc1.tar.gz 120755822 BLAKE2B a729d37d96ba498cb865c6f708734dccb796b2caabb69167b9aa3b0e12c788f2a5980a048b99d5603da3d26af909fb31f406b4f4743cabae56c45f829a7bf695 SHA512 27137fc700971147c00ded6787eaae9f0bcf98c938fe227a5a559b38d983736f3d086f4ff6772d802c5f48a7d97a97c293261e4af88fcb5a720693b9cb5a4f02
26 -DIST llvmorg-10.0.0-rc2.tar.gz 120795019 BLAKE2B 6e701eddbd2313e777c7b37dff8455a08d3c599d01055b60afc0319373d4709deb429aac6bf9e80c4d2e2ab8ade03bf5b398b6ccd8882e4bde608d10cdbf2284 SHA512 ee571c9258a2d9fc411964f56b0b92b2e7134349ed21dbe7963eb61ef65da506e0c4f7c69259a3b6cecec23f55d24636608287ee4457ee667031e141f8f09aae
27 DIST llvmorg-10.0.0-rc3.tar.gz 120814170 BLAKE2B 432fe0c1e74d3020a269a256e6e456cbfa0b7166dd3f86df6caf3a55e1931c022285fe8afdc4d8998c729c5471acf5308abb336782ddec2ef9b0f58d1ccb5a3c SHA512 aad1df86063612d20c48ea7046940330fe2ac572a146be22ff71d9e65fa3438184cb39a2533fc6afd1e74df26909a9f0d24ebcd7d62e74728cfd81e447f2ffbf
28 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
29
30 diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-10.0.0_rc1.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-10.0.0_rc1.ebuild
31 deleted file mode 100644
32 index d622d1cdee5..00000000000
33 --- a/sys-libs/llvm-libunwind/llvm-libunwind-10.0.0_rc1.ebuild
34 +++ /dev/null
35 @@ -1,126 +0,0 @@
36 -# Copyright 1999-2020 Gentoo Authors
37 -# Distributed under the terms of the GNU General Public License v2
38 -
39 -EAPI=7
40 -
41 -PYTHON_COMPAT=( python3_{6,7} )
42 -inherit cmake-multilib llvm llvm.org multiprocessing python-any-r1
43 -
44 -DESCRIPTION="C++ runtime stack unwinder from LLVM"
45 -HOMEPAGE="https://github.com/llvm-mirror/libunwind"
46 -LLVM_COMPONENTS=( libunwind )
47 -LLVM_TEST_COMPONENTS=( libcxx{,abi} )
48 -llvm.org_set_globals
49 -
50 -LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
51 -SLOT="0"
52 -KEYWORDS=""
53 -IUSE="debug +static-libs test"
54 -RESTRICT="!test? ( test )"
55 -
56 -RDEPEND="!sys-libs/libunwind"
57 -# llvm-6 for new lit options
58 -DEPEND="
59 - >=sys-devel/llvm-6"
60 -BDEPEND="
61 - test? ( >=sys-devel/clang-3.9.0
62 - $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )"
63 -
64 -# least intrusive of all
65 -CMAKE_BUILD_TYPE=RelWithDebInfo
66 -
67 -python_check_deps() {
68 - has_version "dev-python/lit[${PYTHON_USEDEP}]"
69 -}
70 -
71 -pkg_setup() {
72 - use test && python-any-r1_pkg_setup
73 -}
74 -
75 -multilib_src_configure() {
76 - local libdir=$(get_libdir)
77 -
78 - local mycmakeargs=(
79 - -DLLVM_LIBDIR_SUFFIX=${libdir#lib}
80 - -DLIBUNWIND_ENABLE_ASSERTIONS=$(usex debug)
81 - -DLIBUNWIND_ENABLE_STATIC=$(usex static-libs)
82 - -DLLVM_INCLUDE_TESTS=$(usex test)
83 -
84 - # support non-native unwinding; given it's small enough,
85 - # enable it unconditionally
86 - -DLIBUNWIND_ENABLE_CROSS_UNWINDING=ON
87 - )
88 - if use test; then
89 - local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
90 - local jobs=${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}
91 -
92 - [[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
93 -
94 - mycmakeargs+=(
95 - -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
96 - -DLLVM_LIT_ARGS="-vv;-j;${jobs};--param=cxx_under_test=${clang_path}"
97 - -DLIBUNWIND_LIBCXX_PATH="${WORKDIR}/libcxx"
98 - )
99 - fi
100 -
101 - cmake-utils_src_configure
102 -}
103 -
104 -build_libcxxabi() {
105 - local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/$(get_libdir)"
106 - local CMAKE_USE_DIR=${WORKDIR}/libcxxabi
107 - local BUILD_DIR=${BUILD_DIR}/libcxxabi
108 - local mycmakeargs=(
109 - -DLIBCXXABI_LIBDIR_SUFFIX=
110 - -DLIBCXXABI_ENABLE_SHARED=OFF
111 - -DLIBCXXABI_ENABLE_STATIC=ONF
112 - -DLIBCXXABI_USE_LLVM_UNWINDER=ON
113 - -DLIBCXXABI_INCLUDE_TESTS=OFF
114 -
115 - -DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}"/libcxx/include
116 - -DLIBCXXABI_LIBUNWIND_INCLUDES="${S}"/include
117 - )
118 -
119 - cmake-utils_src_configure
120 - cmake-utils_src_compile
121 -}
122 -
123 -build_libcxx() {
124 - local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/libcxxabi/lib -L${BUILD_DIR}/$(get_libdir)"
125 - local CMAKE_USE_DIR=${WORKDIR}/libcxx
126 - local BUILD_DIR=${BUILD_DIR}/libcxx
127 - local mycmakeargs=(
128 - -DLIBCXX_LIBDIR_SUFFIX=
129 - -DLIBCXX_ENABLE_SHARED=OFF
130 - -DLIBCXX_ENABLE_STATIC=ON
131 - -DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF
132 - -DLIBCXXABI_USE_LLVM_UNWINDER=ON
133 - -DLIBCXX_CXX_ABI=libcxxabi
134 - -DLIBCXX_CXX_ABI_INCLUDE_PATHS="${WORKDIR}"/libcxxabi/include
135 - -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
136 - -DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
137 - -DLIBCXX_HAS_GCC_S_LIB=OFF
138 - -DLIBCXX_INCLUDE_TESTS=OFF
139 - )
140 -
141 - cmake-utils_src_configure
142 - cmake-utils_src_compile
143 -}
144 -
145 -multilib_src_test() {
146 - # build local copies of libc++ & libc++abi for testing to avoid
147 - # circular deps
148 - build_libcxxabi
149 - build_libcxx
150 - mv "${BUILD_DIR}"/libcxx*/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" || die
151 -
152 - local -x LIT_PRESERVES_TMP=1
153 - cmake-utils_src_make check-unwind
154 -}
155 -
156 -multilib_src_install() {
157 - cmake-utils_src_install
158 -
159 - # install headers like sys-libs/libunwind
160 - doheader "${S}"/include/*.h
161 -}
162
163 diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-10.0.0_rc2.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-10.0.0_rc2.ebuild
164 deleted file mode 100644
165 index d622d1cdee5..00000000000
166 --- a/sys-libs/llvm-libunwind/llvm-libunwind-10.0.0_rc2.ebuild
167 +++ /dev/null
168 @@ -1,126 +0,0 @@
169 -# Copyright 1999-2020 Gentoo Authors
170 -# Distributed under the terms of the GNU General Public License v2
171 -
172 -EAPI=7
173 -
174 -PYTHON_COMPAT=( python3_{6,7} )
175 -inherit cmake-multilib llvm llvm.org multiprocessing python-any-r1
176 -
177 -DESCRIPTION="C++ runtime stack unwinder from LLVM"
178 -HOMEPAGE="https://github.com/llvm-mirror/libunwind"
179 -LLVM_COMPONENTS=( libunwind )
180 -LLVM_TEST_COMPONENTS=( libcxx{,abi} )
181 -llvm.org_set_globals
182 -
183 -LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
184 -SLOT="0"
185 -KEYWORDS=""
186 -IUSE="debug +static-libs test"
187 -RESTRICT="!test? ( test )"
188 -
189 -RDEPEND="!sys-libs/libunwind"
190 -# llvm-6 for new lit options
191 -DEPEND="
192 - >=sys-devel/llvm-6"
193 -BDEPEND="
194 - test? ( >=sys-devel/clang-3.9.0
195 - $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )"
196 -
197 -# least intrusive of all
198 -CMAKE_BUILD_TYPE=RelWithDebInfo
199 -
200 -python_check_deps() {
201 - has_version "dev-python/lit[${PYTHON_USEDEP}]"
202 -}
203 -
204 -pkg_setup() {
205 - use test && python-any-r1_pkg_setup
206 -}
207 -
208 -multilib_src_configure() {
209 - local libdir=$(get_libdir)
210 -
211 - local mycmakeargs=(
212 - -DLLVM_LIBDIR_SUFFIX=${libdir#lib}
213 - -DLIBUNWIND_ENABLE_ASSERTIONS=$(usex debug)
214 - -DLIBUNWIND_ENABLE_STATIC=$(usex static-libs)
215 - -DLLVM_INCLUDE_TESTS=$(usex test)
216 -
217 - # support non-native unwinding; given it's small enough,
218 - # enable it unconditionally
219 - -DLIBUNWIND_ENABLE_CROSS_UNWINDING=ON
220 - )
221 - if use test; then
222 - local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
223 - local jobs=${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}
224 -
225 - [[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
226 -
227 - mycmakeargs+=(
228 - -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
229 - -DLLVM_LIT_ARGS="-vv;-j;${jobs};--param=cxx_under_test=${clang_path}"
230 - -DLIBUNWIND_LIBCXX_PATH="${WORKDIR}/libcxx"
231 - )
232 - fi
233 -
234 - cmake-utils_src_configure
235 -}
236 -
237 -build_libcxxabi() {
238 - local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/$(get_libdir)"
239 - local CMAKE_USE_DIR=${WORKDIR}/libcxxabi
240 - local BUILD_DIR=${BUILD_DIR}/libcxxabi
241 - local mycmakeargs=(
242 - -DLIBCXXABI_LIBDIR_SUFFIX=
243 - -DLIBCXXABI_ENABLE_SHARED=OFF
244 - -DLIBCXXABI_ENABLE_STATIC=ONF
245 - -DLIBCXXABI_USE_LLVM_UNWINDER=ON
246 - -DLIBCXXABI_INCLUDE_TESTS=OFF
247 -
248 - -DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}"/libcxx/include
249 - -DLIBCXXABI_LIBUNWIND_INCLUDES="${S}"/include
250 - )
251 -
252 - cmake-utils_src_configure
253 - cmake-utils_src_compile
254 -}
255 -
256 -build_libcxx() {
257 - local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/libcxxabi/lib -L${BUILD_DIR}/$(get_libdir)"
258 - local CMAKE_USE_DIR=${WORKDIR}/libcxx
259 - local BUILD_DIR=${BUILD_DIR}/libcxx
260 - local mycmakeargs=(
261 - -DLIBCXX_LIBDIR_SUFFIX=
262 - -DLIBCXX_ENABLE_SHARED=OFF
263 - -DLIBCXX_ENABLE_STATIC=ON
264 - -DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF
265 - -DLIBCXXABI_USE_LLVM_UNWINDER=ON
266 - -DLIBCXX_CXX_ABI=libcxxabi
267 - -DLIBCXX_CXX_ABI_INCLUDE_PATHS="${WORKDIR}"/libcxxabi/include
268 - -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
269 - -DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
270 - -DLIBCXX_HAS_GCC_S_LIB=OFF
271 - -DLIBCXX_INCLUDE_TESTS=OFF
272 - )
273 -
274 - cmake-utils_src_configure
275 - cmake-utils_src_compile
276 -}
277 -
278 -multilib_src_test() {
279 - # build local copies of libc++ & libc++abi for testing to avoid
280 - # circular deps
281 - build_libcxxabi
282 - build_libcxx
283 - mv "${BUILD_DIR}"/libcxx*/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" || die
284 -
285 - local -x LIT_PRESERVES_TMP=1
286 - cmake-utils_src_make check-unwind
287 -}
288 -
289 -multilib_src_install() {
290 - cmake-utils_src_install
291 -
292 - # install headers like sys-libs/libunwind
293 - doheader "${S}"/include/*.h
294 -}