1 |
commit: b7712b100afd17c4ad829c65ddf700a06bd7c9f6 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Nov 1 18:00:05 2019 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Nov 3 11:46:21 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7712b10 |
7 |
|
8 |
sys-libs/llvm-libunwind: Port to llvm.org eclass |
9 |
|
10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
11 |
|
12 |
.../llvm-libunwind-10.0.0.9999.ebuild | 25 ++++++++------------- |
13 |
.../llvm-libunwind/llvm-libunwind-9.0.0.ebuild | 25 +++++---------------- |
14 |
.../llvm-libunwind-9.0.1.9999.ebuild | 26 ++++++++-------------- |
15 |
3 files changed, 23 insertions(+), 53 deletions(-) |
16 |
|
17 |
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-10.0.0.9999.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-10.0.0.9999.ebuild |
18 |
index 2edd3ca69fd..29ee7839931 100644 |
19 |
--- a/sys-libs/llvm-libunwind/llvm-libunwind-10.0.0.9999.ebuild |
20 |
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-10.0.0.9999.ebuild |
21 |
@@ -4,13 +4,13 @@ |
22 |
EAPI=7 |
23 |
|
24 |
PYTHON_COMPAT=( python{2_7,3_{5,6,7}} ) |
25 |
-inherit cmake-multilib git-r3 llvm multiprocessing python-any-r1 |
26 |
+inherit cmake-multilib llvm llvm.org multiprocessing python-any-r1 |
27 |
|
28 |
DESCRIPTION="C++ runtime stack unwinder from LLVM" |
29 |
HOMEPAGE="https://github.com/llvm-mirror/libunwind" |
30 |
-SRC_URI="" |
31 |
-EGIT_REPO_URI="https://github.com/llvm/llvm-project.git" |
32 |
-S=${WORKDIR}/${P}/libunwind |
33 |
+LLVM_COMPONENTS=( libunwind ) |
34 |
+LLVM_TEST_COMPONENTS=( libcxx{,abi} ) |
35 |
+llvm.org_set_globals |
36 |
|
37 |
LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" |
38 |
SLOT="0" |
39 |
@@ -29,13 +29,6 @@ BDEPEND=" |
40 |
# least intrusive of all |
41 |
CMAKE_BUILD_TYPE=RelWithDebInfo |
42 |
|
43 |
-src_unpack() { |
44 |
- local dirs=( libunwind ) |
45 |
- use test && dirs+=( libcxx{,abi} ) |
46 |
- git-r3_fetch |
47 |
- git-r3_checkout '' '' '' "${dirs[@]}" |
48 |
-} |
49 |
- |
50 |
python_check_deps() { |
51 |
has_version "dev-python/lit[${PYTHON_USEDEP}]" |
52 |
} |
53 |
@@ -66,7 +59,7 @@ multilib_src_configure() { |
54 |
mycmakeargs+=( |
55 |
-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" |
56 |
-DLLVM_LIT_ARGS="-vv;-j;${jobs};--param=cxx_under_test=${clang_path}" |
57 |
- -DLIBUNWIND_LIBCXX_PATH="${WORKDIR}/${P}/libcxx" |
58 |
+ -DLIBUNWIND_LIBCXX_PATH="${WORKDIR}/libcxx" |
59 |
) |
60 |
fi |
61 |
|
62 |
@@ -75,7 +68,7 @@ multilib_src_configure() { |
63 |
|
64 |
build_libcxxabi() { |
65 |
local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/$(get_libdir)" |
66 |
- local CMAKE_USE_DIR=${WORKDIR}/${P}/libcxxabi |
67 |
+ local CMAKE_USE_DIR=${WORKDIR}/libcxxabi |
68 |
local BUILD_DIR=${BUILD_DIR}/libcxxabi |
69 |
local mycmakeargs=( |
70 |
-DLIBCXXABI_LIBDIR_SUFFIX= |
71 |
@@ -84,7 +77,7 @@ build_libcxxabi() { |
72 |
-DLIBCXXABI_USE_LLVM_UNWINDER=ON |
73 |
-DLIBCXXABI_INCLUDE_TESTS=OFF |
74 |
|
75 |
- -DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}/${P}"/libcxx/include |
76 |
+ -DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}"/libcxx/include |
77 |
-DLIBCXXABI_LIBUNWIND_INCLUDES="${S}"/include |
78 |
) |
79 |
|
80 |
@@ -94,7 +87,7 @@ build_libcxxabi() { |
81 |
|
82 |
build_libcxx() { |
83 |
local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/libcxxabi/lib -L${BUILD_DIR}/$(get_libdir)" |
84 |
- local CMAKE_USE_DIR=${WORKDIR}/${P}/libcxx |
85 |
+ local CMAKE_USE_DIR=${WORKDIR}/libcxx |
86 |
local BUILD_DIR=${BUILD_DIR}/libcxx |
87 |
local mycmakeargs=( |
88 |
-DLIBCXX_LIBDIR_SUFFIX= |
89 |
@@ -103,7 +96,7 @@ build_libcxx() { |
90 |
-DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF |
91 |
-DLIBCXXABI_USE_LLVM_UNWINDER=ON |
92 |
-DLIBCXX_CXX_ABI=libcxxabi |
93 |
- -DLIBCXX_CXX_ABI_INCLUDE_PATHS="${WORKDIR}/${P}"/libcxxabi/include |
94 |
+ -DLIBCXX_CXX_ABI_INCLUDE_PATHS="${WORKDIR}"/libcxxabi/include |
95 |
-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF |
96 |
-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl) |
97 |
-DLIBCXX_HAS_GCC_S_LIB=OFF |
98 |
|
99 |
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-9.0.0.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-9.0.0.ebuild |
100 |
index 3cdeb8d20c2..373f7d8c03a 100644 |
101 |
--- a/sys-libs/llvm-libunwind/llvm-libunwind-9.0.0.ebuild |
102 |
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-9.0.0.ebuild |
103 |
@@ -4,19 +4,13 @@ |
104 |
EAPI=7 |
105 |
|
106 |
PYTHON_COMPAT=( python{2_7,3_{5,6,7}} ) |
107 |
-inherit cmake-multilib llvm multiprocessing python-any-r1 |
108 |
- |
109 |
-MY_P=libunwind-${PV/_/}.src |
110 |
-LIBCXX_P=libcxx-${PV/_/}.src |
111 |
-LIBCXXABI_P=libcxxabi-${PV/_/}.src |
112 |
+inherit cmake-multilib llvm llvm.org multiprocessing python-any-r1 |
113 |
|
114 |
DESCRIPTION="C++ runtime stack unwinder from LLVM" |
115 |
HOMEPAGE="https://github.com/llvm-mirror/libunwind" |
116 |
-SRC_URI="https://releases.llvm.org/${PV}/${MY_P}.tar.xz |
117 |
- test? ( |
118 |
- https://releases.llvm.org/${PV}/${LIBCXX_P}.tar.xz |
119 |
- https://releases.llvm.org/${PV}/${LIBCXXABI_P}.tar.xz )" |
120 |
-S=${WORKDIR}/${MY_P} |
121 |
+LLVM_COMPONENTS=( libunwind ) |
122 |
+LLVM_TEST_COMPONENTS=( libcxx{,abi} ) |
123 |
+llvm.org_set_globals |
124 |
|
125 |
LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" |
126 |
SLOT="0" |
127 |
@@ -43,15 +37,6 @@ pkg_setup() { |
128 |
use test && python-any-r1_pkg_setup |
129 |
} |
130 |
|
131 |
-src_unpack() { |
132 |
- default |
133 |
- |
134 |
- if use test; then |
135 |
- mv "${LIBCXX_P}" libcxx || die |
136 |
- mv "${LIBCXXABI_P}" libcxxabi || die |
137 |
- fi |
138 |
-} |
139 |
- |
140 |
multilib_src_configure() { |
141 |
local libdir=$(get_libdir) |
142 |
|
143 |
@@ -74,7 +59,7 @@ multilib_src_configure() { |
144 |
mycmakeargs+=( |
145 |
-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" |
146 |
-DLLVM_LIT_ARGS="-vv;-j;${jobs};--param=cxx_under_test=${clang_path}" |
147 |
- -DLIBUNWIND_LIBCXX_PATH="${WORKDIR}"/libcxx |
148 |
+ -DLIBUNWIND_LIBCXX_PATH="${WORKDIR}/libcxx" |
149 |
) |
150 |
fi |
151 |
|
152 |
|
153 |
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-9.0.1.9999.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-9.0.1.9999.ebuild |
154 |
index 91a1c433459..29ee7839931 100644 |
155 |
--- a/sys-libs/llvm-libunwind/llvm-libunwind-9.0.1.9999.ebuild |
156 |
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-9.0.1.9999.ebuild |
157 |
@@ -4,14 +4,13 @@ |
158 |
EAPI=7 |
159 |
|
160 |
PYTHON_COMPAT=( python{2_7,3_{5,6,7}} ) |
161 |
-inherit cmake-multilib git-r3 llvm multiprocessing python-any-r1 |
162 |
+inherit cmake-multilib llvm llvm.org multiprocessing python-any-r1 |
163 |
|
164 |
DESCRIPTION="C++ runtime stack unwinder from LLVM" |
165 |
HOMEPAGE="https://github.com/llvm-mirror/libunwind" |
166 |
-SRC_URI="" |
167 |
-EGIT_REPO_URI="https://github.com/llvm/llvm-project.git" |
168 |
-EGIT_BRANCH="release/9.x" |
169 |
-S=${WORKDIR}/${P}/libunwind |
170 |
+LLVM_COMPONENTS=( libunwind ) |
171 |
+LLVM_TEST_COMPONENTS=( libcxx{,abi} ) |
172 |
+llvm.org_set_globals |
173 |
|
174 |
LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" |
175 |
SLOT="0" |
176 |
@@ -30,13 +29,6 @@ BDEPEND=" |
177 |
# least intrusive of all |
178 |
CMAKE_BUILD_TYPE=RelWithDebInfo |
179 |
|
180 |
-src_unpack() { |
181 |
- local dirs=( libunwind ) |
182 |
- use test && dirs+=( libcxx{,abi} ) |
183 |
- git-r3_fetch |
184 |
- git-r3_checkout '' '' '' "${dirs[@]}" |
185 |
-} |
186 |
- |
187 |
python_check_deps() { |
188 |
has_version "dev-python/lit[${PYTHON_USEDEP}]" |
189 |
} |
190 |
@@ -67,7 +59,7 @@ multilib_src_configure() { |
191 |
mycmakeargs+=( |
192 |
-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" |
193 |
-DLLVM_LIT_ARGS="-vv;-j;${jobs};--param=cxx_under_test=${clang_path}" |
194 |
- -DLIBUNWIND_LIBCXX_PATH="${WORKDIR}/${P}/libcxx" |
195 |
+ -DLIBUNWIND_LIBCXX_PATH="${WORKDIR}/libcxx" |
196 |
) |
197 |
fi |
198 |
|
199 |
@@ -76,7 +68,7 @@ multilib_src_configure() { |
200 |
|
201 |
build_libcxxabi() { |
202 |
local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/$(get_libdir)" |
203 |
- local CMAKE_USE_DIR=${WORKDIR}/${P}/libcxxabi |
204 |
+ local CMAKE_USE_DIR=${WORKDIR}/libcxxabi |
205 |
local BUILD_DIR=${BUILD_DIR}/libcxxabi |
206 |
local mycmakeargs=( |
207 |
-DLIBCXXABI_LIBDIR_SUFFIX= |
208 |
@@ -85,7 +77,7 @@ build_libcxxabi() { |
209 |
-DLIBCXXABI_USE_LLVM_UNWINDER=ON |
210 |
-DLIBCXXABI_INCLUDE_TESTS=OFF |
211 |
|
212 |
- -DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}/${P}"/libcxx/include |
213 |
+ -DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}"/libcxx/include |
214 |
-DLIBCXXABI_LIBUNWIND_INCLUDES="${S}"/include |
215 |
) |
216 |
|
217 |
@@ -95,7 +87,7 @@ build_libcxxabi() { |
218 |
|
219 |
build_libcxx() { |
220 |
local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/libcxxabi/lib -L${BUILD_DIR}/$(get_libdir)" |
221 |
- local CMAKE_USE_DIR=${WORKDIR}/${P}/libcxx |
222 |
+ local CMAKE_USE_DIR=${WORKDIR}/libcxx |
223 |
local BUILD_DIR=${BUILD_DIR}/libcxx |
224 |
local mycmakeargs=( |
225 |
-DLIBCXX_LIBDIR_SUFFIX= |
226 |
@@ -104,7 +96,7 @@ build_libcxx() { |
227 |
-DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF |
228 |
-DLIBCXXABI_USE_LLVM_UNWINDER=ON |
229 |
-DLIBCXX_CXX_ABI=libcxxabi |
230 |
- -DLIBCXX_CXX_ABI_INCLUDE_PATHS="${WORKDIR}/${P}"/libcxxabi/include |
231 |
+ -DLIBCXX_CXX_ABI_INCLUDE_PATHS="${WORKDIR}"/libcxxabi/include |
232 |
-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF |
233 |
-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl) |
234 |
-DLIBCXX_HAS_GCC_S_LIB=OFF |