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: Fri, 01 May 2020 08:54:12
Message-Id: 1588323222.397557b4055bc16cb200cc14547336b58a8c99d5.mgorny@gentoo
1 commit: 397557b4055bc16cb200cc14547336b58a8c99d5
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Fri May 1 08:46:45 2020 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Fri May 1 08:53:42 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=397557b4
7
8 sys-libs/llvm-libunwind: Remove 7*
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 sys-libs/llvm-libunwind/Manifest | 3 -
13 .../llvm-libunwind/llvm-libunwind-7.1.0.ebuild | 143 ---------------------
14 2 files changed, 146 deletions(-)
15
16 diff --git a/sys-libs/llvm-libunwind/Manifest b/sys-libs/llvm-libunwind/Manifest
17 index 1c102b7baf6..292f0faeb83 100644
18 --- a/sys-libs/llvm-libunwind/Manifest
19 +++ b/sys-libs/llvm-libunwind/Manifest
20 @@ -1,8 +1,5 @@
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 libunwind-7.1.0.src.tar.xz 79780 BLAKE2B 8f15dcf4a9c8cb45f17c72bf058eed13a6cd52842ee8630781c3104be77d9a868e241eafd34a31b23aeff18dc49743dd5a566ce4cb866a170f1d09899584e2dd SHA512 8ebfeb821013167e866986a2f9cc6459e43d82f73560a15ee7e0d604a974e1c656f824c9f7ccb47da4b4830ad9a99c663961bdf7642cd105e666b8a8fdf7d03c
26 DIST libunwind-8.0.1.src.tar.xz 87188 BLAKE2B 26f4d8ffbc8eb316e4e623280d6fe493e4c5c29489b90633c8215fe91349de7f7f0cfbfe8991ace11656d3782e13c7208b4a4adc04691746b4140187fba40043 SHA512 c115582ca879e215b97d24e4aa80696796383e79856cf26e40b4ddd6b255d598f9fa9867b30f0fd1691be770779835ac1d4b9a5e4a71424b18499b79ea37d060
27 DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
28 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
29
30 diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-7.1.0.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-7.1.0.ebuild
31 deleted file mode 100644
32 index 595c95f32f1..00000000000
33 --- a/sys-libs/llvm-libunwind/llvm-libunwind-7.1.0.ebuild
34 +++ /dev/null
35 @@ -1,143 +0,0 @@
36 -# Copyright 1999-2020 Gentoo Authors
37 -# Distributed under the terms of the GNU General Public License v2
38 -
39 -EAPI=6
40 -
41 -: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
42 -# (needed due to CMAKE_BUILD_TYPE != Gentoo)
43 -CMAKE_MIN_VERSION=3.7.0-r1
44 -PYTHON_COMPAT=( python3_6 )
45 -inherit cmake-multilib llvm multiprocessing python-any-r1
46 -
47 -MY_P=libunwind-${PV/_/}.src
48 -LIBCXX_P=libcxx-${PV/_/}.src
49 -LIBCXXABI_P=libcxxabi-${PV/_/}.src
50 -
51 -DESCRIPTION="C++ runtime stack unwinder from LLVM"
52 -HOMEPAGE="https://github.com/llvm-mirror/libunwind"
53 -SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz
54 - test? (
55 - https://releases.llvm.org/${PV/_//}/${LIBCXX_P}.tar.xz
56 - https://releases.llvm.org/${PV/_//}/${LIBCXXABI_P}.tar.xz )"
57 -
58 -LICENSE="|| ( UoI-NCSA MIT )"
59 -SLOT="0"
60 -KEYWORDS="amd64 ~arm arm64 x86"
61 -IUSE="debug +static-libs test"
62 -RESTRICT="!test? ( test )"
63 -
64 -RDEPEND="!sys-libs/libunwind"
65 -# llvm-6 for new lit options
66 -DEPEND="
67 - >=sys-devel/llvm-6
68 - test? ( >=sys-devel/clang-3.9.0
69 - $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )"
70 -
71 -S=${WORKDIR}/${MY_P}
72 -
73 -# least intrusive of all
74 -CMAKE_BUILD_TYPE=RelWithDebInfo
75 -
76 -python_check_deps() {
77 - has_version "dev-python/lit[${PYTHON_USEDEP}]"
78 -}
79 -
80 -pkg_setup() {
81 - use test && python-any-r1_pkg_setup
82 -}
83 -
84 -src_unpack() {
85 - default
86 -
87 - if use test; then
88 - mv "${LIBCXX_P}" libcxx || die
89 - mv "${LIBCXXABI_P}" libcxxabi || die
90 - fi
91 -}
92 -
93 -multilib_src_configure() {
94 - local libdir=$(get_libdir)
95 -
96 - local mycmakeargs=(
97 - -DLLVM_LIBDIR_SUFFIX=${libdir#lib}
98 - -DLIBUNWIND_ENABLE_ASSERTIONS=$(usex debug)
99 - -DLIBUNWIND_ENABLE_STATIC=$(usex static-libs)
100 - -DLLVM_INCLUDE_TESTS=$(usex test)
101 -
102 - # support non-native unwinding; given it's small enough,
103 - # enable it unconditionally
104 - -DLIBUNWIND_ENABLE_CROSS_UNWINDING=ON
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 - -DLIBUNWIND_LIBCXX_PATH="${WORKDIR}"/libcxx
116 - )
117 - fi
118 -
119 - cmake-utils_src_configure
120 -}
121 -
122 -build_libcxxabi() {
123 - local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/$(get_libdir)"
124 - local CMAKE_USE_DIR=${WORKDIR}/libcxxabi
125 - local BUILD_DIR=${BUILD_DIR}/libcxxabi
126 - local mycmakeargs=(
127 - -DLIBCXXABI_LIBDIR_SUFFIX=
128 - -DLIBCXXABI_ENABLE_SHARED=ON
129 - -DLIBCXXABI_ENABLE_STATIC=OFF
130 - -DLIBCXXABI_USE_LLVM_UNWINDER=ON
131 - -DLIBCXXABI_INCLUDE_TESTS=OFF
132 -
133 - -DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}"/libcxx/include
134 - -DLIBCXXABI_LIBUNWIND_INCLUDES="${S}"/include
135 - )
136 -
137 - cmake-utils_src_configure
138 - cmake-utils_src_compile
139 -}
140 -
141 -build_libcxx() {
142 - local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/libcxxabi/lib -L${BUILD_DIR}/$(get_libdir)"
143 - local CMAKE_USE_DIR=${WORKDIR}/libcxx
144 - local BUILD_DIR=${BUILD_DIR}/libcxx
145 - local mycmakeargs=(
146 - -DLIBCXX_LIBDIR_SUFFIX=
147 - -DLIBCXX_ENABLE_SHARED=ON
148 - -DLIBCXX_ENABLE_STATIC=OFF
149 - -DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF
150 - -DLIBCXXABI_USE_LLVM_UNWINDER=ON
151 - -DLIBCXX_CXX_ABI=libcxxabi
152 - -DLIBCXX_CXX_ABI_INCLUDE_PATHS="${WORKDIR}"/libcxxabi/include
153 - -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
154 - -DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
155 - -DLIBCXX_HAS_GCC_S_LIB=OFF
156 - -DLIBCXX_INCLUDE_TESTS=OFF
157 - )
158 -
159 - cmake-utils_src_configure
160 - cmake-utils_src_compile
161 -}
162 -
163 -multilib_src_test() {
164 - # build local copies of libc++ & libc++abi for testing to avoid
165 - # circular deps
166 - build_libcxxabi
167 - build_libcxx
168 - mv "${BUILD_DIR}"/libcxx*/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" || die
169 -
170 - cmake-utils_src_make check-unwind
171 -}
172 -
173 -multilib_src_install() {
174 - cmake-utils_src_install
175 -
176 - # install headers like sys-libs/libunwind
177 - doheader "${S}"/include/*.h
178 -}