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: Sun, 30 Dec 2018 11:40:01
Message-Id: 1546169982.db1ca0ede7be61f65b29021467b2eaa5d5f7ec19.mgorny@gentoo
1 commit: db1ca0ede7be61f65b29021467b2eaa5d5f7ec19
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sun Dec 30 11:32:04 2018 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sun Dec 30 11:39:42 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db1ca0ed
7
8 sys-libs/llvm-libunwind: Remove 7.0.0
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.0.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 c91f3c5f1bb..d468751b3fe 100644
18 --- a/sys-libs/llvm-libunwind/Manifest
19 +++ b/sys-libs/llvm-libunwind/Manifest
20 @@ -1,11 +1,8 @@
21 DIST libcxx-6.0.1.src.tar.xz 1552328 BLAKE2B 65a6addd04e530c2a72e8cba207282b9e9fafc01a594d7b11f63d10b6f88eca67a3cdf90b8055e410ede358d9be1f63fbe427f308e1337833447c0260d96e1c8 SHA512 c04f628b0924d76f035f615b59d19ce42dfc19c9a8eea4fe2b22a95cfe5a037ebdb30943fd741443939df5b4cf692bc1e51c840fefefbd134e3afbe2a75fe875
22 -DIST libcxx-7.0.0.src.tar.xz 1652496 BLAKE2B 7c8e4b7743a775a5f41ef1a2e511b44ca67af32be03f4fec9a4f70b49b540a442724afd69a312d68719ace3eee9e3d600c7596bda68496212827e140da5a258e SHA512 5ebf8418bc9d311c1744c257ab7a26cf2436a64a47451905df70ec64b12d25ec33acf99e1b9d552fd54ed850bed8f53dffde2ea20292ecd9976eaa31f144caf5
23 DIST libcxx-7.0.1.src.tar.xz 1638188 BLAKE2B 541d27c3801895d59ad06b15de5fe9ff0d9b5b3ef393a5fad05a12a52dd6453ecc530b0ce3129624a27e959d3c9c5f7066ebb57fd85caca538ebf4f990aa6967 SHA512 b3ad7ad95bdcf2d902b29de8a0b757d4dbc220bc1a22a813d6bcec15a34b3aa42e85c59f4cecbb318c799ca611550b44c328b37278f4349b984016ad4556c1d8
24 DIST libcxxabi-6.0.1.src.tar.xz 528356 BLAKE2B b301b750b2928864d3fc51e66cf91aab6837636ec2bce706b9a97296ec96af4bd2e80b1bf80c9b4afe449335ee12bbdd1905433c27e1770e16bc306baf206927 SHA512 bbb4c7b412e295cb735f637df48a83093eef45ed5444f7766790b4b047f75fd5fd634d8f3a8ac33a5c1407bd16fd450ba113f60a9bcc1d0a911fe0c54e9c81f2
25 -DIST libcxxabi-7.0.0.src.tar.xz 535792 BLAKE2B caad3e2c9a89fcb8ba6b2dcaa23681b5a4f72330e77bdd8b48c6f1382d4414577b2ca130486cefce7a7ec2622712effd9aca0758d5f02d5ac23cedd0b5076be2 SHA512 95aa8f60477739e6d6eb6ba1e32c98928e1b8104d18d659336cf7f1c5bfd1ed505015077dfbe39329c0c9d2b5b428d853e5652b0106c0cde317d2d013ebd1cf0
26 DIST libcxxabi-7.0.1.src.tar.xz 535096 BLAKE2B 212330e8dbde98280b1bcd4f36ea3f30b69af9816e6c252bd9640c45501536ce38e8b57f3e82195d2a33cb1286651f7cad82713c71e8012e512e04c4ff7bad64 SHA512 92e8d28f329e9a8cce296f0fddd88324198f722db3a748bb2164b28ae8eca6047c89ed1e70af00bbedd93ce4285b2ab1e0307a65b88dc60e581eebfd6cbd2038
27 DIST libunwind-4.0.1.src.tar.xz 63388 BLAKE2B f49772beabaa8519a5f8dbbaef9c2d6554468a66b89a5f012946d59f772fe864809a5c95b726bcb4c059ca551a4eb023a88f4fa618756b34fef2058e272467e6 SHA512 8a0552a8ab830010d81420f4b778a3b831bff85b19bcce972958fc30e1ba5a2fa26a3deba499985a43dd7a103690775f6a20e7b3edda55f4eaff3541002d6b59
28 DIST libunwind-5.0.2.src.tar.xz 72340 BLAKE2B 8a62bd91f6decae1a9a51df19f708fcdf72a6fe6e57a5848c5dd0d36ff2dc64db8a0b3af469cdd5e787b9301f2718df0981f91857ecbc7a5f5d95a1a053652bc SHA512 137c4b269bff053d532a373e9f696ca68ad0bbf606a18dc98597e00fcfc6ce21d74bc2a0c03b96444654d688fa97d544c6f6b70822fcf7e190ed96f193ddc6ba
29 DIST libunwind-6.0.1.src.tar.xz 77036 BLAKE2B b6c293285896c8ff1f64bb56eee5a88b102b7ed9902d46436ee3cb79f204f230fd08a07d39c7fa9aeeddd093036f2bb9af38dd54268099ea9e51e12a71ff4adb SHA512 78568c28720abdd1f8471c462421df9965e05e1db048689d16ac85378716c4080ec1723af78e9f61d133b0ff82ac8c1f0dde7fd42d194485f62c1a17c02db37f
30 -DIST libunwind-7.0.0.src.tar.xz 79316 BLAKE2B 2062e4c8fe00b8a72df5cc6a1ae688e2a142687a713d9181764f7d103c67ad1c06c62cb962d35fd3f99e4d058808188a40198d8de6635147fc06873ac489bcee SHA512 9ee573089f4d0bfb57bd9012e3ad3308fe53216a8e6745aa35dfaa16e56c1adbfc419e336e235a8e76f57b01b9e6e6c9ceff624bd99a90f519137e62f141738d
31 DIST libunwind-7.0.1.src.tar.xz 79784 BLAKE2B c426ef661d1c5ba8abfdb7c155b44d8c9301e2254031cff9fcb0634f61d7374779095be3118c0a29c69e60c63a32405334242413625ece8c5c9130d58bedd865 SHA512 e6203e77691c7039496da09e55d27a994a0e273ab0ef10df2f0b9345fead11d855413342a7ccc7b641c3f06053210a8822ba39e9f5b8624384bf1fa456deb969
32
33 diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-7.0.0.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-7.0.0.ebuild
34 deleted file mode 100644
35 index a0c7316b8bb..00000000000
36 --- a/sys-libs/llvm-libunwind/llvm-libunwind-7.0.0.ebuild
37 +++ /dev/null
38 @@ -1,143 +0,0 @@
39 -# Copyright 1999-2018 Gentoo Authors
40 -# Distributed under the terms of the GNU General Public License v2
41 -
42 -EAPI=6
43 -
44 -: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
45 -# (needed due to CMAKE_BUILD_TYPE != Gentoo)
46 -CMAKE_MIN_VERSION=3.7.0-r1
47 -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
48 -inherit cmake-multilib llvm multiprocessing python-any-r1
49 -
50 -MY_P=libunwind-${PV/_/}.src
51 -LIBCXX_P=libcxx-${PV/_/}.src
52 -LIBCXXABI_P=libcxxabi-${PV/_/}.src
53 -
54 -DESCRIPTION="C++ runtime stack unwinder from LLVM"
55 -HOMEPAGE="https://github.com/llvm-mirror/libunwind"
56 -SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz
57 - test? (
58 - https://releases.llvm.org/${PV/_//}/${LIBCXX_P}.tar.xz
59 - https://releases.llvm.org/${PV/_//}/${LIBCXXABI_P}.tar.xz )"
60 -
61 -LICENSE="|| ( UoI-NCSA MIT )"
62 -SLOT="0"
63 -KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-fbsd"
64 -IUSE="debug +static-libs test"
65 -RESTRICT="!test? ( test )"
66 -
67 -RDEPEND="!sys-libs/libunwind"
68 -# llvm-6 for new lit options
69 -DEPEND="
70 - >=sys-devel/llvm-6
71 - test? ( >=sys-devel/clang-3.9.0
72 - $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )"
73 -
74 -S=${WORKDIR}/${MY_P}
75 -
76 -# least intrusive of all
77 -CMAKE_BUILD_TYPE=RelWithDebInfo
78 -
79 -python_check_deps() {
80 - has_version "dev-python/lit[${PYTHON_USEDEP}]"
81 -}
82 -
83 -pkg_setup() {
84 - use test && python-any-r1_pkg_setup
85 -}
86 -
87 -src_unpack() {
88 - default
89 -
90 - if use test; then
91 - mv "${LIBCXX_P}" libcxx || die
92 - mv "${LIBCXXABI_P}" libcxxabi || die
93 - fi
94 -}
95 -
96 -multilib_src_configure() {
97 - local libdir=$(get_libdir)
98 -
99 - local mycmakeargs=(
100 - -DLLVM_LIBDIR_SUFFIX=${libdir#lib}
101 - -DLIBUNWIND_ENABLE_ASSERTIONS=$(usex debug)
102 - -DLIBUNWIND_ENABLE_STATIC=$(usex static-libs)
103 - -DLLVM_INCLUDE_TESTS=$(usex test)
104 -
105 - # support non-native unwinding; given it's small enough,
106 - # enable it unconditionally
107 - -DLIBUNWIND_ENABLE_CROSS_UNWINDING=ON
108 - )
109 - if use test; then
110 - local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
111 - local jobs=${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}
112 -
113 - [[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
114 -
115 - mycmakeargs+=(
116 - -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
117 - -DLLVM_LIT_ARGS="-vv;-j;${jobs};--param=cxx_under_test=${clang_path}"
118 - -DLIBUNWIND_LIBCXX_PATH="${WORKDIR}"/libcxx
119 - )
120 - fi
121 -
122 - cmake-utils_src_configure
123 -}
124 -
125 -build_libcxxabi() {
126 - local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/$(get_libdir)"
127 - local CMAKE_USE_DIR=${WORKDIR}/libcxxabi
128 - local BUILD_DIR=${BUILD_DIR}/libcxxabi
129 - local mycmakeargs=(
130 - -DLIBCXXABI_LIBDIR_SUFFIX=
131 - -DLIBCXXABI_ENABLE_SHARED=ON
132 - -DLIBCXXABI_ENABLE_STATIC=OFF
133 - -DLIBCXXABI_USE_LLVM_UNWINDER=ON
134 - -DLIBCXXABI_INCLUDE_TESTS=OFF
135 -
136 - -DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}"/libcxx/include
137 - -DLIBCXXABI_LIBUNWIND_INCLUDES="${S}"/include
138 - )
139 -
140 - cmake-utils_src_configure
141 - cmake-utils_src_compile
142 -}
143 -
144 -build_libcxx() {
145 - local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/libcxxabi/lib -L${BUILD_DIR}/$(get_libdir)"
146 - local CMAKE_USE_DIR=${WORKDIR}/libcxx
147 - local BUILD_DIR=${BUILD_DIR}/libcxx
148 - local mycmakeargs=(
149 - -DLIBCXX_LIBDIR_SUFFIX=
150 - -DLIBCXX_ENABLE_SHARED=ON
151 - -DLIBCXX_ENABLE_STATIC=OFF
152 - -DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF
153 - -DLIBCXXABI_USE_LLVM_UNWINDER=ON
154 - -DLIBCXX_CXX_ABI=libcxxabi
155 - -DLIBCXX_CXX_ABI_INCLUDE_PATHS="${WORKDIR}"/libcxxabi/include
156 - -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
157 - -DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
158 - -DLIBCXX_HAS_GCC_S_LIB=OFF
159 - -DLIBCXX_INCLUDE_TESTS=OFF
160 - )
161 -
162 - cmake-utils_src_configure
163 - cmake-utils_src_compile
164 -}
165 -
166 -multilib_src_test() {
167 - # build local copies of libc++ & libc++abi for testing to avoid
168 - # circular deps
169 - build_libcxxabi
170 - build_libcxx
171 - mv "${BUILD_DIR}"/libcxx*/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" || die
172 -
173 - cmake-utils_src_make check-unwind
174 -}
175 -
176 -multilib_src_install() {
177 - cmake-utils_src_install
178 -
179 - # install headers like sys-libs/libunwind
180 - doheader "${S}"/include/*.h
181 -}