Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

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, 13 Mar 2019 08:22:28
Message-Id: 1552463395.77c9645f31f2dbbc62d7714d411b28bd1c28a86b.mgorny@gentoo
1 commit: 77c9645f31f2dbbc62d7714d411b28bd1c28a86b
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed Mar 13 07:49:55 2019 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed Mar 13 07:49:55 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77c9645f
7
8 sys-libs/llvm-libunwind: Remove 8.0.0rc[23]
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 sys-libs/llvm-libunwind/Manifest | 6 -
13 .../llvm-libunwind/llvm-libunwind-8.0.0_rc2.ebuild | 143 ---------------------
14 .../llvm-libunwind/llvm-libunwind-8.0.0_rc3.ebuild | 143 ---------------------
15 3 files changed, 292 deletions(-)
16
17 diff --git a/sys-libs/llvm-libunwind/Manifest b/sys-libs/llvm-libunwind/Manifest
18 index 515dcc48cdf..a84e463edc2 100644
19 --- a/sys-libs/llvm-libunwind/Manifest
20 +++ b/sys-libs/llvm-libunwind/Manifest
21 @@ -1,15 +1,9 @@
22 DIST libcxx-6.0.1.src.tar.xz 1552328 BLAKE2B 65a6addd04e530c2a72e8cba207282b9e9fafc01a594d7b11f63d10b6f88eca67a3cdf90b8055e410ede358d9be1f63fbe427f308e1337833447c0260d96e1c8 SHA512 c04f628b0924d76f035f615b59d19ce42dfc19c9a8eea4fe2b22a95cfe5a037ebdb30943fd741443939df5b4cf692bc1e51c840fefefbd134e3afbe2a75fe875
23 DIST libcxx-7.0.1.src.tar.xz 1638188 BLAKE2B 541d27c3801895d59ad06b15de5fe9ff0d9b5b3ef393a5fad05a12a52dd6453ecc530b0ce3129624a27e959d3c9c5f7066ebb57fd85caca538ebf4f990aa6967 SHA512 b3ad7ad95bdcf2d902b29de8a0b757d4dbc220bc1a22a813d6bcec15a34b3aa42e85c59f4cecbb318c799ca611550b44c328b37278f4349b984016ad4556c1d8
24 -DIST libcxx-8.0.0rc2.src.tar.xz 1755516 BLAKE2B b6c15d0d50d01e69afb376140052a1d27e2acef45796781497b35dbd8c26db88883e17105fb4e83c50097ab7a4ebf077350754bc1b1d43ef8426b82a7e92b72d SHA512 79ac5a389f5a6bcb145e8e387ae2cbdf0679996a9f66fe38a8e62cd893b6ed68943824d5538e7408b57ecfa4182aec20b837158c9a6f50188c1e9aae176a4f5f
25 -DIST libcxx-8.0.0rc3.src.tar.xz 1755192 BLAKE2B 32d0602a13a273f396f139dd25f67ed0a12881c618eef35e0bb9b6d8d8cb786f130ce3ce7e8027f8f2a2516de5d1f9753bc12e81497a0bc919731866da04dba2 SHA512 f59e6fdd20d18cfb39c426eadcda5a611dc79735fc1fc8c4cebd4106afa35736ceb3500bba7f162bccced1964785fc18c129e9bb68dd6549b205cae14cd46f8b
26 DIST libcxx-8.0.0rc5.src.tar.xz 1755168 BLAKE2B ec3e77fc15d92d4a2e04b706b52379e2f5fefbdd00e6f1bd63061c42781330b279507e690f2f14185e18893bb7b985251e68b5282b26b4c20afbed671d35073b SHA512 aaf6495ea7ddf68441aa4422ca7d0d02f17875553f34010d1e5061a5180774990b227edc6fe133dd4081de7e4f835228ac286b974800fd396b3650c4f7899b7a
27 DIST libcxxabi-6.0.1.src.tar.xz 528356 BLAKE2B b301b750b2928864d3fc51e66cf91aab6837636ec2bce706b9a97296ec96af4bd2e80b1bf80c9b4afe449335ee12bbdd1905433c27e1770e16bc306baf206927 SHA512 bbb4c7b412e295cb735f637df48a83093eef45ed5444f7766790b4b047f75fd5fd634d8f3a8ac33a5c1407bd16fd450ba113f60a9bcc1d0a911fe0c54e9c81f2
28 DIST libcxxabi-7.0.1.src.tar.xz 535096 BLAKE2B 212330e8dbde98280b1bcd4f36ea3f30b69af9816e6c252bd9640c45501536ce38e8b57f3e82195d2a33cb1286651f7cad82713c71e8012e512e04c4ff7bad64 SHA512 92e8d28f329e9a8cce296f0fddd88324198f722db3a748bb2164b28ae8eca6047c89ed1e70af00bbedd93ce4285b2ab1e0307a65b88dc60e581eebfd6cbd2038
29 -DIST libcxxabi-8.0.0rc2.src.tar.xz 539092 BLAKE2B 2e03457c44d45035f18b01f34766d520e44f680ec9c73c8166a081e7311119a1ac17461d7e15f60728f4c1eb5d4a285b29c1b2123059d065eaf7f46c233210cb SHA512 9887da2b1ae4fe821e6e66fd4ce5f134d8600243e64fbac2bc5baaaa08dee689367ab1667522bc91328b18222f9fbe59fe79346b8ef529652b1ac300cf5bc161
30 -DIST libcxxabi-8.0.0rc3.src.tar.xz 538928 BLAKE2B 8babd986626c8ab3b542a2c71172de3cb0ff681225d1876a8903dd77756edeaaffb86c142525323a002dcdb963bb996b7aa77f46564b0a6fa7f1e0b35759ab10 SHA512 f9bbcab81e206f0b5e7306f7f3fd9a8bd934e5877ca6237d53c0380549292a3f64fcdf25cbd95b8effa7c1adfa083584afd029f052f4b24ef9a9a5c6fc0d0305
31 DIST libcxxabi-8.0.0rc5.src.tar.xz 539008 BLAKE2B 899a1dd983e0265dd7961e6d9ed23e6f171b0ab195fc7164ab1d94ec82f52bee370296edfd51cc800cc9646feb92bf338075b19c4ef545ad9195f8ce83bddbea SHA512 9bc9bde4787a21febc0b385c22dd20c33876c79aff585dbee6414d9982cce8ee5df05ed2a681eaf40b4d656e177feb4dcff4782663119ede72c4f4907aca2b9f
32 DIST libunwind-6.0.1.src.tar.xz 77036 BLAKE2B b6c293285896c8ff1f64bb56eee5a88b102b7ed9902d46436ee3cb79f204f230fd08a07d39c7fa9aeeddd093036f2bb9af38dd54268099ea9e51e12a71ff4adb SHA512 78568c28720abdd1f8471c462421df9965e05e1db048689d16ac85378716c4080ec1723af78e9f61d133b0ff82ac8c1f0dde7fd42d194485f62c1a17c02db37f
33 DIST libunwind-7.0.1.src.tar.xz 79784 BLAKE2B c426ef661d1c5ba8abfdb7c155b44d8c9301e2254031cff9fcb0634f61d7374779095be3118c0a29c69e60c63a32405334242413625ece8c5c9130d58bedd865 SHA512 e6203e77691c7039496da09e55d27a994a0e273ab0ef10df2f0b9345fead11d855413342a7ccc7b641c3f06053210a8822ba39e9f5b8624384bf1fa456deb969
34 -DIST libunwind-8.0.0rc2.src.tar.xz 86508 BLAKE2B 1aa4999c25046ac272ebcff0a2bf0d53846660fa336e6dfea7e794ef1ab21c1c9040c3beda6fb02f5552426f4b859eec71e4bf76886c0c9780c51892d9733ef4 SHA512 50ad07e5d6571d6f98681e796bc9877105c1ab1e3aa8ee76258c121cb5b0cc99675c47cf9513822ef3a522592f1ee4e836031c878d9d96cb973ddebcdcad8841
35 -DIST libunwind-8.0.0rc3.src.tar.xz 86484 BLAKE2B 1c154a05da650fa9fab277590725d0c5ddfe82448f8eb4ebffe030fe3b8e4eca75e5d2261cce33cae2483f0f130fad8c735da173f4aaf31d66f417de75d65eca SHA512 d1bea93113221d1d8ded58dfc4b36789f0567933074b0100e0defba1491dccb3663f3063fc17fa4128fe7ff67efd4915b5dabd85dc90a54b52ac5faf85d664a0
36 DIST libunwind-8.0.0rc5.src.tar.xz 86516 BLAKE2B 0ac17d2ae1dd79f8b8bd5ee746d31a864ece20538bc283d8cb75be7ed40ddecb03e4b7c7ecd0214e34e85a299b925f374a07c0218b7c8c7df30db79c2dd8bac6 SHA512 994cc5db4d250cadb2b8e71842f4d1c937fbb102b71980054b641bbedf64b7867ac9f380ed0ca2b557b9c5ab2cd2d911398d4b8545bfefd5cd3d250ced9bd170
37
38 diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-8.0.0_rc2.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-8.0.0_rc2.ebuild
39 deleted file mode 100644
40 index 6948d378b79..00000000000
41 --- a/sys-libs/llvm-libunwind/llvm-libunwind-8.0.0_rc2.ebuild
42 +++ /dev/null
43 @@ -1,143 +0,0 @@
44 -# Copyright 1999-2019 Gentoo Authors
45 -# Distributed under the terms of the GNU General Public License v2
46 -
47 -EAPI=6
48 -
49 -: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
50 -# (needed due to CMAKE_BUILD_TYPE != Gentoo)
51 -CMAKE_MIN_VERSION=3.7.0-r1
52 -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
53 -inherit cmake-multilib llvm multiprocessing python-any-r1
54 -
55 -MY_P=libunwind-${PV/_/}.src
56 -LIBCXX_P=libcxx-${PV/_/}.src
57 -LIBCXXABI_P=libcxxabi-${PV/_/}.src
58 -
59 -DESCRIPTION="C++ runtime stack unwinder from LLVM"
60 -HOMEPAGE="https://github.com/llvm-mirror/libunwind"
61 -SRC_URI="https://prereleases.llvm.org/${PV/_//}/${MY_P}.tar.xz
62 - test? (
63 - https://prereleases.llvm.org/${PV/_//}/${LIBCXX_P}.tar.xz
64 - https://prereleases.llvm.org/${PV/_//}/${LIBCXXABI_P}.tar.xz )"
65 -
66 -LICENSE="|| ( UoI-NCSA MIT )"
67 -SLOT="0"
68 -KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-fbsd"
69 -IUSE="debug +static-libs test"
70 -RESTRICT="!test? ( test )"
71 -
72 -RDEPEND="!sys-libs/libunwind"
73 -# llvm-6 for new lit options
74 -DEPEND="
75 - >=sys-devel/llvm-6
76 - test? ( >=sys-devel/clang-3.9.0
77 - $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )"
78 -
79 -S=${WORKDIR}/${MY_P}
80 -
81 -# least intrusive of all
82 -CMAKE_BUILD_TYPE=RelWithDebInfo
83 -
84 -python_check_deps() {
85 - has_version "dev-python/lit[${PYTHON_USEDEP}]"
86 -}
87 -
88 -pkg_setup() {
89 - use test && python-any-r1_pkg_setup
90 -}
91 -
92 -src_unpack() {
93 - default
94 -
95 - if use test; then
96 - mv "${LIBCXX_P}" libcxx || die
97 - mv "${LIBCXXABI_P}" libcxxabi || die
98 - fi
99 -}
100 -
101 -multilib_src_configure() {
102 - local libdir=$(get_libdir)
103 -
104 - local mycmakeargs=(
105 - -DLLVM_LIBDIR_SUFFIX=${libdir#lib}
106 - -DLIBUNWIND_ENABLE_ASSERTIONS=$(usex debug)
107 - -DLIBUNWIND_ENABLE_STATIC=$(usex static-libs)
108 - -DLLVM_INCLUDE_TESTS=$(usex test)
109 -
110 - # support non-native unwinding; given it's small enough,
111 - # enable it unconditionally
112 - -DLIBUNWIND_ENABLE_CROSS_UNWINDING=ON
113 - )
114 - if use test; then
115 - local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
116 - local jobs=${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}
117 -
118 - [[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
119 -
120 - mycmakeargs+=(
121 - -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
122 - -DLLVM_LIT_ARGS="-vv;-j;${jobs};--param=cxx_under_test=${clang_path}"
123 - -DLIBUNWIND_LIBCXX_PATH="${WORKDIR}"/libcxx
124 - )
125 - fi
126 -
127 - cmake-utils_src_configure
128 -}
129 -
130 -build_libcxxabi() {
131 - local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/$(get_libdir)"
132 - local CMAKE_USE_DIR=${WORKDIR}/libcxxabi
133 - local BUILD_DIR=${BUILD_DIR}/libcxxabi
134 - local mycmakeargs=(
135 - -DLIBCXXABI_LIBDIR_SUFFIX=
136 - -DLIBCXXABI_ENABLE_SHARED=ON
137 - -DLIBCXXABI_ENABLE_STATIC=OFF
138 - -DLIBCXXABI_USE_LLVM_UNWINDER=ON
139 - -DLIBCXXABI_INCLUDE_TESTS=OFF
140 -
141 - -DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}"/libcxx/include
142 - -DLIBCXXABI_LIBUNWIND_INCLUDES="${S}"/include
143 - )
144 -
145 - cmake-utils_src_configure
146 - cmake-utils_src_compile
147 -}
148 -
149 -build_libcxx() {
150 - local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/libcxxabi/lib -L${BUILD_DIR}/$(get_libdir)"
151 - local CMAKE_USE_DIR=${WORKDIR}/libcxx
152 - local BUILD_DIR=${BUILD_DIR}/libcxx
153 - local mycmakeargs=(
154 - -DLIBCXX_LIBDIR_SUFFIX=
155 - -DLIBCXX_ENABLE_SHARED=ON
156 - -DLIBCXX_ENABLE_STATIC=OFF
157 - -DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF
158 - -DLIBCXXABI_USE_LLVM_UNWINDER=ON
159 - -DLIBCXX_CXX_ABI=libcxxabi
160 - -DLIBCXX_CXX_ABI_INCLUDE_PATHS="${WORKDIR}"/libcxxabi/include
161 - -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
162 - -DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
163 - -DLIBCXX_HAS_GCC_S_LIB=OFF
164 - -DLIBCXX_INCLUDE_TESTS=OFF
165 - )
166 -
167 - cmake-utils_src_configure
168 - cmake-utils_src_compile
169 -}
170 -
171 -multilib_src_test() {
172 - # build local copies of libc++ & libc++abi for testing to avoid
173 - # circular deps
174 - build_libcxxabi
175 - build_libcxx
176 - mv "${BUILD_DIR}"/libcxx*/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" || die
177 -
178 - cmake-utils_src_make check-unwind
179 -}
180 -
181 -multilib_src_install() {
182 - cmake-utils_src_install
183 -
184 - # install headers like sys-libs/libunwind
185 - doheader "${S}"/include/*.h
186 -}
187
188 diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-8.0.0_rc3.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-8.0.0_rc3.ebuild
189 deleted file mode 100644
190 index 6948d378b79..00000000000
191 --- a/sys-libs/llvm-libunwind/llvm-libunwind-8.0.0_rc3.ebuild
192 +++ /dev/null
193 @@ -1,143 +0,0 @@
194 -# Copyright 1999-2019 Gentoo Authors
195 -# Distributed under the terms of the GNU General Public License v2
196 -
197 -EAPI=6
198 -
199 -: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
200 -# (needed due to CMAKE_BUILD_TYPE != Gentoo)
201 -CMAKE_MIN_VERSION=3.7.0-r1
202 -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
203 -inherit cmake-multilib llvm multiprocessing python-any-r1
204 -
205 -MY_P=libunwind-${PV/_/}.src
206 -LIBCXX_P=libcxx-${PV/_/}.src
207 -LIBCXXABI_P=libcxxabi-${PV/_/}.src
208 -
209 -DESCRIPTION="C++ runtime stack unwinder from LLVM"
210 -HOMEPAGE="https://github.com/llvm-mirror/libunwind"
211 -SRC_URI="https://prereleases.llvm.org/${PV/_//}/${MY_P}.tar.xz
212 - test? (
213 - https://prereleases.llvm.org/${PV/_//}/${LIBCXX_P}.tar.xz
214 - https://prereleases.llvm.org/${PV/_//}/${LIBCXXABI_P}.tar.xz )"
215 -
216 -LICENSE="|| ( UoI-NCSA MIT )"
217 -SLOT="0"
218 -KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-fbsd"
219 -IUSE="debug +static-libs test"
220 -RESTRICT="!test? ( test )"
221 -
222 -RDEPEND="!sys-libs/libunwind"
223 -# llvm-6 for new lit options
224 -DEPEND="
225 - >=sys-devel/llvm-6
226 - test? ( >=sys-devel/clang-3.9.0
227 - $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )"
228 -
229 -S=${WORKDIR}/${MY_P}
230 -
231 -# least intrusive of all
232 -CMAKE_BUILD_TYPE=RelWithDebInfo
233 -
234 -python_check_deps() {
235 - has_version "dev-python/lit[${PYTHON_USEDEP}]"
236 -}
237 -
238 -pkg_setup() {
239 - use test && python-any-r1_pkg_setup
240 -}
241 -
242 -src_unpack() {
243 - default
244 -
245 - if use test; then
246 - mv "${LIBCXX_P}" libcxx || die
247 - mv "${LIBCXXABI_P}" libcxxabi || die
248 - fi
249 -}
250 -
251 -multilib_src_configure() {
252 - local libdir=$(get_libdir)
253 -
254 - local mycmakeargs=(
255 - -DLLVM_LIBDIR_SUFFIX=${libdir#lib}
256 - -DLIBUNWIND_ENABLE_ASSERTIONS=$(usex debug)
257 - -DLIBUNWIND_ENABLE_STATIC=$(usex static-libs)
258 - -DLLVM_INCLUDE_TESTS=$(usex test)
259 -
260 - # support non-native unwinding; given it's small enough,
261 - # enable it unconditionally
262 - -DLIBUNWIND_ENABLE_CROSS_UNWINDING=ON
263 - )
264 - if use test; then
265 - local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
266 - local jobs=${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}
267 -
268 - [[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
269 -
270 - mycmakeargs+=(
271 - -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
272 - -DLLVM_LIT_ARGS="-vv;-j;${jobs};--param=cxx_under_test=${clang_path}"
273 - -DLIBUNWIND_LIBCXX_PATH="${WORKDIR}"/libcxx
274 - )
275 - fi
276 -
277 - cmake-utils_src_configure
278 -}
279 -
280 -build_libcxxabi() {
281 - local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/$(get_libdir)"
282 - local CMAKE_USE_DIR=${WORKDIR}/libcxxabi
283 - local BUILD_DIR=${BUILD_DIR}/libcxxabi
284 - local mycmakeargs=(
285 - -DLIBCXXABI_LIBDIR_SUFFIX=
286 - -DLIBCXXABI_ENABLE_SHARED=ON
287 - -DLIBCXXABI_ENABLE_STATIC=OFF
288 - -DLIBCXXABI_USE_LLVM_UNWINDER=ON
289 - -DLIBCXXABI_INCLUDE_TESTS=OFF
290 -
291 - -DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}"/libcxx/include
292 - -DLIBCXXABI_LIBUNWIND_INCLUDES="${S}"/include
293 - )
294 -
295 - cmake-utils_src_configure
296 - cmake-utils_src_compile
297 -}
298 -
299 -build_libcxx() {
300 - local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/libcxxabi/lib -L${BUILD_DIR}/$(get_libdir)"
301 - local CMAKE_USE_DIR=${WORKDIR}/libcxx
302 - local BUILD_DIR=${BUILD_DIR}/libcxx
303 - local mycmakeargs=(
304 - -DLIBCXX_LIBDIR_SUFFIX=
305 - -DLIBCXX_ENABLE_SHARED=ON
306 - -DLIBCXX_ENABLE_STATIC=OFF
307 - -DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF
308 - -DLIBCXXABI_USE_LLVM_UNWINDER=ON
309 - -DLIBCXX_CXX_ABI=libcxxabi
310 - -DLIBCXX_CXX_ABI_INCLUDE_PATHS="${WORKDIR}"/libcxxabi/include
311 - -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
312 - -DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
313 - -DLIBCXX_HAS_GCC_S_LIB=OFF
314 - -DLIBCXX_INCLUDE_TESTS=OFF
315 - )
316 -
317 - cmake-utils_src_configure
318 - cmake-utils_src_compile
319 -}
320 -
321 -multilib_src_test() {
322 - # build local copies of libc++ & libc++abi for testing to avoid
323 - # circular deps
324 - build_libcxxabi
325 - build_libcxx
326 - mv "${BUILD_DIR}"/libcxx*/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" || die
327 -
328 - cmake-utils_src_make check-unwind
329 -}
330 -
331 -multilib_src_install() {
332 - cmake-utils_src_install
333 -
334 - # install headers like sys-libs/libunwind
335 - doheader "${S}"/include/*.h
336 -}
Report Message
Find on MARC Find on Google Groups