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: Thu, 30 Jul 2020 22:11:40
Message-Id: 1596146997.826eb3a45e9e8462cd02099e7d770e496fd8965f.mgorny@gentoo
1 commit: 826eb3a45e9e8462cd02099e7d770e496fd8965f
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jul 29 11:48:30 2020 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Thu Jul 30 22:09:57 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=826eb3a4
7
8 sys-libs/llvm-libunwind: Remove 8*
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-8.0.1.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 c654012d5e5..082dafda8ad 100644
18 --- a/sys-libs/llvm-libunwind/Manifest
19 +++ b/sys-libs/llvm-libunwind/Manifest
20 @@ -1,6 +1,3 @@
21 -DIST libcxx-8.0.1.src.tar.xz 1739524 BLAKE2B 6e641cb6bda0de12c8408d3ab33f627389ac014aa65b3391c870aa96ffd347784e6b70b953bd1ee8eba56554e0f78a723ab77b9dba5f85e6219e2b95ca50c160 SHA512 75749d08b2b343c6f5f9aefb04be63e42f6d12efc51101d3647ed6f70c7a6d050afb3ab2f3636eae78cb523f5844de67b960a7a3145ed89ab0c7015deb14921e
22 -DIST libcxxabi-8.0.1.src.tar.xz 538356 BLAKE2B 52328c5890c9b9271877b953be30cc39be4758101e6b91ee45f06c81e960089523e80b83eb5c354336e4e0a140f7554640acf7b2d4fa619113f705108a314418 SHA512 577cfcb04ebb29ee84d35ed31aa8fecb28fc74b07ef7ff298f0fe2d440f823def73e092359c41d8d8600e6df18f55224ed89674d403c5ae56a7d7973487b8734
23 -DIST libunwind-8.0.1.src.tar.xz 87188 BLAKE2B 26f4d8ffbc8eb316e4e623280d6fe493e4c5c29489b90633c8215fe91349de7f7f0cfbfe8991ace11656d3782e13c7208b4a4adc04691746b4140187fba40043 SHA512 c115582ca879e215b97d24e4aa80696796383e79856cf26e40b4ddd6b255d598f9fa9867b30f0fd1691be770779835ac1d4b9a5e4a71424b18499b79ea37d060
24 DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
25 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
26 DIST llvmorg-11.0.0-rc1.tar.gz 122688246 BLAKE2B 10ff3f08ff3780abb1d86ac67942e6aac52ff5daf820a2e3d23d8b79dbade1c5b1d398d0a577028d2d7c8759ab9a8b552a0305b5750310a015585c06cdadf844 SHA512 09564ed903902a5795fffaa4679badc30bf49739889a48074b5ae2c93bd29000cfb36a650208d5cae5d74899bade066f84b4aa023fc852eec246ff67bf64a267
27
28 diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-8.0.1.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-8.0.1.ebuild
29 deleted file mode 100644
30 index f31969be8e5..00000000000
31 --- a/sys-libs/llvm-libunwind/llvm-libunwind-8.0.1.ebuild
32 +++ /dev/null
33 @@ -1,143 +0,0 @@
34 -# Copyright 1999-2020 Gentoo Authors
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI=6
38 -
39 -: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
40 -# (needed due to CMAKE_BUILD_TYPE != Gentoo)
41 -CMAKE_MIN_VERSION=3.7.0-r1
42 -PYTHON_COMPAT=( python3_6 )
43 -inherit cmake-multilib llvm multiprocessing python-any-r1
44 -
45 -MY_P=libunwind-${PV/_/}.src
46 -LIBCXX_P=libcxx-${PV/_/}.src
47 -LIBCXXABI_P=libcxxabi-${PV/_/}.src
48 -
49 -DESCRIPTION="C++ runtime stack unwinder from LLVM"
50 -HOMEPAGE="https://github.com/llvm-mirror/libunwind"
51 -SRC_URI="https://github.com/llvm/llvm-project/releases/download/llvmorg-${PV}/${MY_P}.tar.xz
52 - test? (
53 - https://github.com/llvm/llvm-project/releases/download/llvmorg-${PV}/${LIBCXX_P}.tar.xz
54 - https://github.com/llvm/llvm-project/releases/download/llvmorg-${PV}/${LIBCXXABI_P}.tar.xz )"
55 -
56 -LICENSE="|| ( UoI-NCSA MIT )"
57 -SLOT="0"
58 -KEYWORDS="amd64 arm arm64 x86"
59 -IUSE="debug +static-libs test"
60 -RESTRICT="!test? ( test )"
61 -
62 -RDEPEND="!sys-libs/libunwind"
63 -# llvm-6 for new lit options
64 -DEPEND="
65 - >=sys-devel/llvm-6
66 - test? ( >=sys-devel/clang-3.9.0
67 - $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )"
68 -
69 -S=${WORKDIR}/${MY_P}
70 -
71 -# least intrusive of all
72 -CMAKE_BUILD_TYPE=RelWithDebInfo
73 -
74 -python_check_deps() {
75 - has_version "dev-python/lit[${PYTHON_USEDEP}]"
76 -}
77 -
78 -pkg_setup() {
79 - use test && python-any-r1_pkg_setup
80 -}
81 -
82 -src_unpack() {
83 - default
84 -
85 - if use test; then
86 - mv "${LIBCXX_P}" libcxx || die
87 - mv "${LIBCXXABI_P}" libcxxabi || die
88 - fi
89 -}
90 -
91 -multilib_src_configure() {
92 - local libdir=$(get_libdir)
93 -
94 - local mycmakeargs=(
95 - -DLLVM_LIBDIR_SUFFIX=${libdir#lib}
96 - -DLIBUNWIND_ENABLE_ASSERTIONS=$(usex debug)
97 - -DLIBUNWIND_ENABLE_STATIC=$(usex static-libs)
98 - -DLLVM_INCLUDE_TESTS=$(usex test)
99 -
100 - # support non-native unwinding; given it's small enough,
101 - # enable it unconditionally
102 - -DLIBUNWIND_ENABLE_CROSS_UNWINDING=ON
103 - )
104 - if use test; then
105 - local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
106 - local jobs=${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}
107 -
108 - [[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
109 -
110 - mycmakeargs+=(
111 - -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
112 - -DLLVM_LIT_ARGS="-vv;-j;${jobs};--param=cxx_under_test=${clang_path}"
113 - -DLIBUNWIND_LIBCXX_PATH="${WORKDIR}"/libcxx
114 - )
115 - fi
116 -
117 - cmake-utils_src_configure
118 -}
119 -
120 -build_libcxxabi() {
121 - local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/$(get_libdir)"
122 - local CMAKE_USE_DIR=${WORKDIR}/libcxxabi
123 - local BUILD_DIR=${BUILD_DIR}/libcxxabi
124 - local mycmakeargs=(
125 - -DLIBCXXABI_LIBDIR_SUFFIX=
126 - -DLIBCXXABI_ENABLE_SHARED=ON
127 - -DLIBCXXABI_ENABLE_STATIC=OFF
128 - -DLIBCXXABI_USE_LLVM_UNWINDER=ON
129 - -DLIBCXXABI_INCLUDE_TESTS=OFF
130 -
131 - -DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}"/libcxx/include
132 - -DLIBCXXABI_LIBUNWIND_INCLUDES="${S}"/include
133 - )
134 -
135 - cmake-utils_src_configure
136 - cmake-utils_src_compile
137 -}
138 -
139 -build_libcxx() {
140 - local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/libcxxabi/lib -L${BUILD_DIR}/$(get_libdir)"
141 - local CMAKE_USE_DIR=${WORKDIR}/libcxx
142 - local BUILD_DIR=${BUILD_DIR}/libcxx
143 - local mycmakeargs=(
144 - -DLIBCXX_LIBDIR_SUFFIX=
145 - -DLIBCXX_ENABLE_SHARED=ON
146 - -DLIBCXX_ENABLE_STATIC=OFF
147 - -DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF
148 - -DLIBCXXABI_USE_LLVM_UNWINDER=ON
149 - -DLIBCXX_CXX_ABI=libcxxabi
150 - -DLIBCXX_CXX_ABI_INCLUDE_PATHS="${WORKDIR}"/libcxxabi/include
151 - -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
152 - -DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
153 - -DLIBCXX_HAS_GCC_S_LIB=OFF
154 - -DLIBCXX_INCLUDE_TESTS=OFF
155 - )
156 -
157 - cmake-utils_src_configure
158 - cmake-utils_src_compile
159 -}
160 -
161 -multilib_src_test() {
162 - # build local copies of libc++ & libc++abi for testing to avoid
163 - # circular deps
164 - build_libcxxabi
165 - build_libcxx
166 - mv "${BUILD_DIR}"/libcxx*/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" || die
167 -
168 - cmake-utils_src_make check-unwind
169 -}
170 -
171 -multilib_src_install() {
172 - cmake-utils_src_install
173 -
174 - # install headers like sys-libs/libunwind
175 - doheader "${S}"/include/*.h
176 -}