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:24:22
Message-Id: 1631344651.aeb19f3dc8e6d15fd06cdab0181549b1fb95f169.mgorny@gentoo
1 commit: aeb19f3dc8e6d15fd06cdab0181549b1fb95f169
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sat Sep 11 07:17:07 2021 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sat Sep 11 07:17:31 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aeb19f3d
7
8 sys-libs/llvm-libunwind: Remove 12.0.0
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 sys-libs/llvm-libunwind/Manifest | 1 -
13 .../llvm-libunwind/llvm-libunwind-12.0.0.ebuild | 138 ---------------------
14 2 files changed, 139 deletions(-)
15
16 diff --git a/sys-libs/llvm-libunwind/Manifest b/sys-libs/llvm-libunwind/Manifest
17 index 396c3740d59..e8e78e47c69 100644
18 --- a/sys-libs/llvm-libunwind/Manifest
19 +++ b/sys-libs/llvm-libunwind/Manifest
20 @@ -1,6 +1,5 @@
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.0.tar.gz 134226215 BLAKE2B f9c3ba8c58571855caa4f206fd285c9b5be66672fb0814cb8bc0964a051f57f5d35013aa1e27cbda502652b37df1ec23474129109e76a42066847860db441dbe SHA512 0cff02155c5ac0d6db2b72d60d9819d5b5dd859663b45f721b1c7540239c2fceb1f57d9173f6870c49de851c242ed8e85c5c6d6577a1f8092a7c5dcd12513b26
24 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
25 DIST llvmorg-13.0.0-rc1.tar.gz 147235597 BLAKE2B 089fed119dee8a16f278cebb13808bd5a95629cc87ebee3050225cc041b78fee51acacc5bcc913d4a99e830bfe5774b19a04a845293c5087dd2a8c9d94d2fde9 SHA512 6e307e2c2dcb7ff41d11ee29d69f41c0ef55f200999847a3a924a2e773fc9c2160015746789af8b723c628bd232f97fce63370209bd0065491d80b0cc0017e85
26 DIST llvmorg-13.0.0-rc2.tar.gz 147267736 BLAKE2B 153bf7320f2aa911112d366ffc79f7110cb04f135c2a8b176c263f0a75eb768206d9bd462893d45504b0e58aa9e127fdcafb02300eab1666e4616aa654d457dd SHA512 a01baf3eaa02f02af42bfcf6dcf24f166351bf1c09601495617c81e41def23210573bad40a344270f40c5deb881d06863536abac2a6481930766a6a56335fb44
27
28 diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-12.0.0.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-12.0.0.ebuild
29 deleted file mode 100644
30 index b907f5db41f..00000000000
31 --- a/sys-libs/llvm-libunwind/llvm-libunwind-12.0.0.ebuild
32 +++ /dev/null
33 @@ -1,138 +0,0 @@
34 -# Copyright 1999-2021 Gentoo Authors
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI=7
38 -
39 -CMAKE_ECLASS=cmake
40 -PYTHON_COMPAT=( python3_{7..9} )
41 -inherit cmake-multilib llvm llvm.org python-any-r1 toolchain-funcs
42 -
43 -DESCRIPTION="C++ runtime stack unwinder from LLVM"
44 -HOMEPAGE="https://github.com/llvm-mirror/libunwind"
45 -
46 -LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
47 -SLOT="0"
48 -KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
49 -IUSE="debug static-libs test"
50 -RESTRICT="!test? ( test )"
51 -
52 -RDEPEND="!sys-libs/libunwind"
53 -# llvm-6 for new lit options
54 -DEPEND="
55 - >=sys-devel/llvm-6"
56 -BDEPEND="
57 - test? ( >=sys-devel/clang-3.9.0
58 - $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
59 - )"
60 -
61 -LLVM_COMPONENTS=( libunwind libcxx llvm/cmake/modules )
62 -LLVM_TEST_COMPONENTS=( libcxxabi )
63 -llvm.org_set_globals
64 -
65 -python_check_deps() {
66 - has_version "dev-python/lit[${PYTHON_USEDEP}]"
67 -}
68 -
69 -pkg_setup() {
70 - use test && python-any-r1_pkg_setup
71 -}
72 -
73 -multilib_src_configure() {
74 - local use_compiler_rt=OFF
75 - local libdir=$(get_libdir)
76 -
77 - # link to compiler-rt
78 - # https://github.com/gentoo/gentoo/pull/21516
79 - if tc-is-clang; then
80 - local compiler_rt=$($(tc-getCC) ${CFLAGS} ${CPPFLAGS} \
81 - ${LD_FLAGS} -print-libgcc-file-name)
82 - if [[ ${compiler_rt} == *libclang_rt* ]]; then
83 - use_compiler_rt=ON
84 - fi
85 - fi
86 -
87 - local mycmakeargs=(
88 - -DLLVM_LIBDIR_SUFFIX=${libdir#lib}
89 - -DLIBUNWIND_ENABLE_ASSERTIONS=$(usex debug)
90 - -DLIBUNWIND_ENABLE_STATIC=$(usex static-libs)
91 - -DLLVM_INCLUDE_TESTS=$(usex test)
92 -
93 - # support non-native unwinding; given it's small enough,
94 - # enable it unconditionally
95 - -DLIBUNWIND_ENABLE_CROSS_UNWINDING=ON
96 -
97 - # avoid dependency on libgcc_s if compiler-rt is used
98 - -DLIBUNWIND_USE_COMPILER_RT=${use_compiler_rt}
99 - )
100 - if use test; then
101 - local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
102 - [[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
103 -
104 - mycmakeargs+=(
105 - -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
106 - -DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}"
107 - -DLIBUNWIND_LIBCXX_PATH="${WORKDIR}/libcxx"
108 - )
109 - fi
110 -
111 - cmake_src_configure
112 -}
113 -
114 -build_libcxxabi() {
115 - local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/$(get_libdir)"
116 - local CMAKE_USE_DIR=${WORKDIR}/libcxxabi
117 - local BUILD_DIR=${BUILD_DIR}/libcxxabi
118 - local mycmakeargs=(
119 - -DLIBCXXABI_LIBDIR_SUFFIX=
120 - -DLIBCXXABI_ENABLE_SHARED=OFF
121 - -DLIBCXXABI_ENABLE_STATIC=ONF
122 - -DLIBCXXABI_USE_LLVM_UNWINDER=ON
123 - -DLIBCXXABI_INCLUDE_TESTS=OFF
124 -
125 - -DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}"/libcxx/include
126 - -DLIBCXXABI_LIBUNWIND_INCLUDES="${S}"/include
127 - )
128 -
129 - cmake_src_configure
130 - cmake_src_compile
131 -}
132 -
133 -build_libcxx() {
134 - local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/libcxxabi/lib -L${BUILD_DIR}/$(get_libdir)"
135 - local CMAKE_USE_DIR=${WORKDIR}/libcxx
136 - local BUILD_DIR=${BUILD_DIR}/libcxx
137 - local mycmakeargs=(
138 - -DLIBCXX_LIBDIR_SUFFIX=
139 - -DLIBCXX_ENABLE_SHARED=OFF
140 - -DLIBCXX_ENABLE_STATIC=ON
141 - -DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF
142 - -DLIBCXXABI_USE_LLVM_UNWINDER=ON
143 - -DLIBCXX_CXX_ABI=libcxxabi
144 - -DLIBCXX_CXX_ABI_INCLUDE_PATHS="${WORKDIR}"/libcxxabi/include
145 - -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
146 - -DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
147 - -DLIBCXX_HAS_GCC_S_LIB=OFF
148 - -DLIBCXX_INCLUDE_TESTS=OFF
149 - )
150 -
151 - cmake_src_configure
152 - cmake_src_compile
153 -}
154 -
155 -multilib_src_test() {
156 - # build local copies of libc++ & libc++abi for testing to avoid
157 - # circular deps
158 - build_libcxxabi
159 - build_libcxx
160 - mv "${BUILD_DIR}"/libcxx*/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" || die
161 -
162 - local -x LIT_PRESERVES_TMP=1
163 - cmake_build check-unwind
164 -}
165 -
166 -multilib_src_install() {
167 - cmake_src_install
168 -
169 - # install headers like sys-libs/libunwind
170 - doheader "${S}"/include/*.h
171 -}