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, 01 Feb 2023 05:15:26
Message-Id: 1675228286.e58b9ee2d98da2ff6c91024e049921f50419fbe4.mgorny@gentoo
1 commit: e58b9ee2d98da2ff6c91024e049921f50419fbe4
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed Feb 1 05:11:26 2023 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed Feb 1 05:11:26 2023 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e58b9ee2
7
8 sys-libs/llvm-libunwind: Remove 13.x
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 sys-libs/llvm-libunwind/Manifest | 2 -
13 .../llvm-libunwind/llvm-libunwind-13.0.1-r1.ebuild | 140 ---------------------
14 2 files changed, 142 deletions(-)
15
16 diff --git a/sys-libs/llvm-libunwind/Manifest b/sys-libs/llvm-libunwind/Manifest
17 index 36e3c4fbf69b..53407e02853b 100644
18 --- a/sys-libs/llvm-libunwind/Manifest
19 +++ b/sys-libs/llvm-libunwind/Manifest
20 @@ -1,4 +1,3 @@
21 -DIST llvm-gentoo-patchset-13.0.1.tar.xz 6288 BLAKE2B 899222b962486e924e4f8a2b574d285531a3f87af9385ff68c81db92aa224a0cde6d4ee049b5405056bedb4b232b50e1d5840024071a4a215f6311853304c92d SHA512 b2805337f1deca626768a44c5e7ac9ed16e0c31bead1647d44a493a8123c1b8e8f1c8ceee3536bcc6fa87fdd3fcec408229f701adf30eff07e7ef9889b847b01
22 DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f15e428f22a536a17e5f4e3eb29a003b8a8ec0abe0fa3e072591161d5f30ef7d8867c1ce34d1b341ad858e93c00263499941a99 SHA512 6fc6eeb60fac698702d1aac495fc0161eb7216a1f8db2020af8fccec5837831f7cc20dc2a169bf4f0b5f520748280b4a86621f3697d622aa58faaa45dbfaad13
23 DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
24 DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78af36b0826a1dfd9a337992499bf701e33149665bfc47d5e14978e38f342559629a559f8b2ce328705ba34fdf6830f5ae9721a5 SHA512 4836d3603f32e8e54434cbfa8ef33d9d473ac5dc20ebf9c67132653c73f4524931abd1084655eaee5f20bcfcb91bcc4bbc5c4a0b603ad0c9029c556e14dc4c52
25 @@ -7,4 +6,3 @@ DIST llvm-project-16.0.0rc1.src.tar.xz 118364920 BLAKE2B 449fa321722e77d1a595d0f
26 DIST llvm-project-16.0.0rc1.src.tar.xz.sig 566 BLAKE2B 29a593f74b05ef6268f0b2ee5ebd810a244e7c6b27dd94f709b22bca8e6c8367f8321a6ec61f85476cd399f31519ac2a3c978014afae29490c1e70d26eb6c35f SHA512 dcca03d41ee3cc7d5b150184b03eb9f2e579603ce9cd5289360d1ca47169174afc26a85079cf096ec91e23f487f0b38bb6cd5fb7e5197530582155b16a5ce748
27 DIST llvm-project-46d5a57801bc37e5ebb1a4d6b2acc0fa99c01e8d.tar.gz 180436731 BLAKE2B 51c30c3f11dd55a225b8ebe4ded752ce9e8eb58751e7458c29901dbdd3673f94892d337d111d696e779e3f7ef0bca6c7d79709e2072a4bf3a001d8813125d571 SHA512 ebbe0f8becac39d63433dcc3de474c40f1215fc8faab94fa2ba869d28e66b27e4fe088377bd7ae64575a6d7b07017b88bf92e5488a3185a753e647d8da352bbf
28 DIST llvm-project-6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz 175208511 BLAKE2B cf87cf7e9bf7c74aab8ccda0f153369cb81798047fdd48025c3c7030857b128babbaafb667385a5c8e9916e16038b14fee39f1623d329471e73c39c2f2d7bbfa SHA512 e6dc0cacd6c079be8a00364e4c244782d764d9a8d514d65f9078427cb4a0c1663ff88761bfbc1e955a1a990451439110497c2cb7af7f56b2c91f2e9db4389894
29 -DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
30
31 diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-13.0.1-r1.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-13.0.1-r1.ebuild
32 deleted file mode 100644
33 index 906a22fbc42e..000000000000
34 --- a/sys-libs/llvm-libunwind/llvm-libunwind-13.0.1-r1.ebuild
35 +++ /dev/null
36 @@ -1,140 +0,0 @@
37 -# Copyright 1999-2023 Gentoo Authors
38 -# Distributed under the terms of the GNU General Public License v2
39 -
40 -EAPI=7
41 -
42 -PYTHON_COMPAT=( python3_{9..10} )
43 -inherit cmake-multilib flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
44 -
45 -DESCRIPTION="C++ runtime stack unwinder from LLVM"
46 -HOMEPAGE="https://llvm.org/docs/ExceptionHandling.html"
47 -
48 -LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
49 -SLOT="0"
50 -KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86 ~x64-macos"
51 -IUSE="debug static-libs test"
52 -RESTRICT="!test? ( test )"
53 -
54 -RDEPEND="!sys-libs/libunwind"
55 -# llvm-6 for new lit options
56 -DEPEND="
57 - >=sys-devel/llvm-6"
58 -BDEPEND="
59 - test? ( >=sys-devel/clang-3.9.0
60 - $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
61 - )"
62 -
63 -LLVM_COMPONENTS=( libunwind libcxx llvm/cmake )
64 -LLVM_TEST_COMPONENTS=( libcxxabi )
65 -LLVM_PATCHSET=${PV/_/-}
66 -llvm.org_set_globals
67 -
68 -python_check_deps() {
69 - python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
70 -}
71 -
72 -pkg_setup() {
73 - use test && python-any-r1_pkg_setup
74 -}
75 -
76 -multilib_src_configure() {
77 - local libdir=$(get_libdir)
78 -
79 - # https://github.com/llvm/llvm-project/issues/56825
80 - # also separately bug #863917
81 - filter-lto
82 -
83 - # link to compiler-rt
84 - # https://github.com/gentoo/gentoo/pull/21516
85 - local use_compiler_rt=OFF
86 - [[ $(tc-get-c-rtlib) == compiler-rt ]] && use_compiler_rt=ON
87 -
88 - local mycmakeargs=(
89 - -DLLVM_LIBDIR_SUFFIX=${libdir#lib}
90 - -DLIBUNWIND_ENABLE_ASSERTIONS=$(usex debug)
91 - -DLIBUNWIND_ENABLE_STATIC=$(usex static-libs)
92 - -DLIBUNWIND_TARGET_TRIPLE="${CHOST}"
93 - -DLLVM_INCLUDE_TESTS=$(usex test)
94 -
95 - # support non-native unwinding; given it's small enough,
96 - # enable it unconditionally
97 - -DLIBUNWIND_ENABLE_CROSS_UNWINDING=ON
98 -
99 - # avoid dependency on libgcc_s if compiler-rt is used
100 - -DLIBUNWIND_USE_COMPILER_RT=${use_compiler_rt}
101 - )
102 - if use test; then
103 - local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
104 - [[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
105 -
106 - mycmakeargs+=(
107 - -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
108 - -DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}"
109 - -DLIBUNWIND_LIBCXX_PATH="${WORKDIR}/libcxx"
110 - )
111 - fi
112 -
113 - cmake_src_configure
114 -}
115 -
116 -wrap_libcxxabi() {
117 - local mycmakeargs=(
118 - -DLIBCXXABI_LIBDIR_SUFFIX=
119 - -DLIBCXXABI_ENABLE_SHARED=OFF
120 - -DLIBCXXABI_ENABLE_STATIC=ON
121 - -DLIBCXXABI_USE_LLVM_UNWINDER=ON
122 - -DLIBCXXABI_INCLUDE_TESTS=OFF
123 -
124 - -DLIBCXXABI_LIBCXX_INCLUDES="${BUILD_DIR}"/libcxx/include/c++/v1
125 - -DLIBCXXABI_LIBUNWIND_INCLUDES="${S}"/include
126 - )
127 -
128 - local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/$(get_libdir)"
129 - local CMAKE_USE_DIR=${WORKDIR}/libcxxabi
130 - local BUILD_DIR=${BUILD_DIR}/libcxxabi
131 -
132 - "${@}"
133 -}
134 -
135 -wrap_libcxx() {
136 - local mycmakeargs=(
137 - -DLIBCXX_LIBDIR_SUFFIX=
138 - -DLIBCXX_ENABLE_SHARED=OFF
139 - -DLIBCXX_ENABLE_STATIC=ON
140 - -DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF
141 - -DLIBCXXABI_USE_LLVM_UNWINDER=ON
142 - -DLIBCXX_CXX_ABI=libcxxabi
143 - -DLIBCXX_CXX_ABI_INCLUDE_PATHS="${WORKDIR}"/libcxxabi/include
144 - -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
145 - -DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
146 - -DLIBCXX_HAS_GCC_S_LIB=OFF
147 - -DLIBCXX_INCLUDE_TESTS=OFF
148 - )
149 -
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 -
154 - "${@}"
155 -}
156 -
157 -multilib_src_test() {
158 - # build local copies of libc++ & libc++abi for testing to avoid
159 - # circular deps
160 - wrap_libcxx cmake_src_configure
161 - wrap_libcxx cmake_build generate-cxx-headers
162 - wrap_libcxxabi cmake_src_configure
163 - wrap_libcxxabi cmake_src_compile
164 - wrap_libcxx cmake_src_compile
165 - mv "${BUILD_DIR}"/libcxx*/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" || die
166 -
167 - local -x LIT_PRESERVES_TMP=1
168 - cmake_build check-unwind
169 -}
170 -
171 -multilib_src_install() {
172 - cmake_src_install
173 -
174 - # install headers like sys-libs/libunwind
175 - doheader "${S}"/include/*.h
176 -}