Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

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