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: dev-ml/llvm-ocaml/
Date: Wed, 13 Mar 2019 08:22:31
Message-Id: 1552463405.8edc3cc9a6d7111399a363d236a2c5aec80f5d8e.mgorny@gentoo
1 commit: 8edc3cc9a6d7111399a363d236a2c5aec80f5d8e
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed Mar 13 07:50:05 2019 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed Mar 13 07:50:05 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8edc3cc9
7
8 dev-ml/llvm-ocaml: Remove 8.0.0rc[23]
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 dev-ml/llvm-ocaml/Manifest | 2 -
13 dev-ml/llvm-ocaml/llvm-ocaml-8.0.0_rc2.ebuild | 127 --------------------------
14 dev-ml/llvm-ocaml/llvm-ocaml-8.0.0_rc3.ebuild | 127 --------------------------
15 3 files changed, 256 deletions(-)
16
17 diff --git a/dev-ml/llvm-ocaml/Manifest b/dev-ml/llvm-ocaml/Manifest
18 index 5f757b818d7..d73560d85b0 100644
19 --- a/dev-ml/llvm-ocaml/Manifest
20 +++ b/dev-ml/llvm-ocaml/Manifest
21 @@ -2,6 +2,4 @@ DIST llvm-4.0.1.src.tar.xz 21065652 BLAKE2B 6327eed2d1feb108440f22d2581d1ff86c10
22 DIST llvm-5.0.2.src.tar.xz 23451868 BLAKE2B b7082be2e4ad557b29b9f6869811f262adcf5c73d552faf91b339bede75cf5eab58afefa12fa779a38be71fe2b8f4ea297c3213ee4e8370cc01972c59249d91c SHA512 3588be5ed969c3f7f6f16f56a12a6af2814d3d3c960d4a36ffebb0446cc75f19220bccee7fc605f9b01f5d5c188a905a046193cc12dec42dd5922048b5c27fe1
23 DIST llvm-6.0.1.src.tar.xz 25306628 BLAKE2B 60232d4d22f8096b565cc8d81fea0639f24f14e8fc4f66ade69fa15479181f07f655f26dff3fa24bf105762b495da316c5c9352db234bd0af6b9c3fff6d4d881 SHA512 cbbb00eb99cfeb4aff623ee1a5ba075e7b5a76fc00c5f9f539ff28c108598f5708a0369d5bd92683def5a20c2fe60cab7827b42d628dbfcc79b57e0e91b84dd9
24 DIST llvm-7.0.1.src.tar.xz 28311056 BLAKE2B 737aa6144a415e41a4ff2c8bd5a727d6f14d7b1810c62cbefa5a25fe642c98cddf8a28e35c7e9783373aa3b96f5c0943229e229ad1b43e56e9ed6db0f27ab128 SHA512 ac43a3cb71a53deb55e3693653847cf20bf6f5d9056f224e6956c96d63bc59ebee9404f088eec9cabe65337b4607a905ef931354b373cf64e0004c6905a6b5df
25 -DIST llvm-8.0.0rc2.src.tar.xz 30492444 BLAKE2B e7afd3b66e3eb204e07348f0bc77f0ae03d8e9581de4c94cba7c0b43b53f36ecd891c1272ce43ea6c78999fd404a7db105266a2eaca22975133571e1152961af SHA512 9d93197848e9472cc2fef2477897e4f4d74a79b17a164fd43446b0ffb327e7f484cf64f0c294d9a99707c0b46282eb0d16e6ceb5d2d568f25e4235f70ae3c5e7
26 -DIST llvm-8.0.0rc3.src.tar.xz 30507604 BLAKE2B c9baaca537d292af9f12368df86090750508113eb7db393fe44c1ba7579df947f0a7092e6ddd4403bda9f9ed75fe8c049f3baf6d8671faa0c91e3267c584893a SHA512 82199841c2084cffe4e86b4f2d5ebe404059196f1f6d000ee69cfddba05d78c4500ad7499615fa67e9774ead6cba5a23db484dd85f752c8d08e8067f7d7b98ca
27 DIST llvm-8.0.0rc5.src.tar.xz 30507432 BLAKE2B 3f20c3dc270439a32fe23e403ca5190e624f329a10d424d15475d32d89725b021f12af19845928da41be4b83afd254df1f6d27f235b0d2ab81ff76d9e588250f SHA512 b015bab2f0b0644d9fab295dee5d3b2a4d4d7c9d5870a06d7829f43d61e92aeb31b28d4c074f6a20ad803dde06399ef3298c951f1580b010f4b756f75bb4453b
28
29 diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-8.0.0_rc2.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-8.0.0_rc2.ebuild
30 deleted file mode 100644
31 index 75111b867fb..00000000000
32 --- a/dev-ml/llvm-ocaml/llvm-ocaml-8.0.0_rc2.ebuild
33 +++ /dev/null
34 @@ -1,127 +0,0 @@
35 -# Copyright 1999-2019 Gentoo Authors
36 -# Distributed under the terms of the GNU General Public License v2
37 -
38 -EAPI=6
39 -
40 -: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
41 -# (needed due to CMAKE_BUILD_TYPE != Gentoo)
42 -CMAKE_MIN_VERSION=3.7.0-r1
43 -PYTHON_COMPAT=( python2_7 )
44 -
45 -inherit cmake-utils llvm multiprocessing python-any-r1
46 -
47 -MY_P=llvm-${PV/_/}.src
48 -DESCRIPTION="OCaml bindings for LLVM"
49 -HOMEPAGE="https://llvm.org/"
50 -SRC_URI="https://prereleases.llvm.org/${PV/_//}/${MY_P}.tar.xz"
51 -
52 -# Keep in sync with sys-devel/llvm
53 -ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
54 - NVPTX PowerPC Sparc SystemZ X86 XCore )
55 -ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
56 -LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
57 -
58 -LICENSE="UoI-NCSA"
59 -SLOT="0/${PV}"
60 -KEYWORDS="~amd64 ~arm ~x86"
61 -IUSE="debug test ${ALL_LLVM_TARGETS[*]}"
62 -RESTRICT="!test? ( test )"
63 -
64 -RDEPEND="
65 - >=dev-lang/ocaml-4.00.0:0=
66 - dev-ml/ocaml-ctypes:=
67 - ~sys-devel/llvm-${PV}:=[${LLVM_TARGET_USEDEPS// /,},debug?]
68 - !sys-devel/llvm[ocaml(-)]"
69 -# configparser-3.2 breaks the build (3.3 or none at all are fine)
70 -DEPEND="${RDEPEND}
71 - dev-lang/perl
72 - dev-ml/findlib
73 - test? ( dev-ml/ounit )
74 - !!<dev-python/configparser-3.3.0.2
75 - ${PYTHON_DEPS}"
76 -
77 -REQUIRED_USE="${PYTHON_REQUIRED_USE}
78 - || ( ${ALL_LLVM_TARGETS[*]} )"
79 -
80 -S=${WORKDIR}/${MY_P}
81 -
82 -# least intrusive of all
83 -CMAKE_BUILD_TYPE=RelWithDebInfo
84 -
85 -pkg_setup() {
86 - LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
87 - python-any-r1_pkg_setup
88 -}
89 -
90 -src_prepare() {
91 - # Python is needed to run tests using lit
92 - python_setup
93 -
94 - cmake-utils_src_prepare
95 -}
96 -
97 -src_configure() {
98 - local libdir=$(get_libdir)
99 - local mycmakeargs=(
100 - -DLLVM_LIBDIR_SUFFIX=${libdir#lib}
101 -
102 - -DBUILD_SHARED_LIBS=ON
103 - -DLLVM_OCAML_OUT_OF_TREE=ON
104 - -DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
105 - -DLLVM_BUILD_TESTS=$(usex test)
106 -
107 - # disable various irrelevant deps and settings
108 - -DLLVM_ENABLE_FFI=OFF
109 - -DLLVM_ENABLE_TERMINFO=OFF
110 - -DHAVE_HISTEDIT_H=NO
111 - -DWITH_POLLY=OFF
112 - -DLLVM_ENABLE_ASSERTIONS=$(usex debug)
113 - -DLLVM_ENABLE_EH=ON
114 - -DLLVM_ENABLE_RTTI=ON
115 -
116 - -DLLVM_HOST_TRIPLE="${CHOST}"
117 -
118 - # disable go bindings
119 - -DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND
120 -
121 - # TODO: ocamldoc
122 - )
123 -
124 - use test && mycmakeargs+=(
125 - -DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
126 - )
127 -
128 - # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
129 - # also: custom rules for OCaml do not work for CPPFLAGS
130 - use debug || local -x CFLAGS="${CFLAGS} -DNDEBUG"
131 - cmake-utils_src_configure
132 -
133 - local llvm_libdir=$(llvm-config --libdir)
134 - # an ugly hack; TODO: figure out a way to pass -L to ocaml...
135 - cd "${BUILD_DIR}/${libdir}" || die
136 - ln -s "${llvm_libdir}"/*.so . || die
137 -
138 - if use test; then
139 - local llvm_bindir=$(llvm-config --bindir)
140 - # Force using system-installed tools.
141 - sed -i -e "/llvm_tools_dir/s@\".*\"@\"${llvm_bindir}\"@" \
142 - "${BUILD_DIR}"/test/lit.site.cfg.py || die
143 - fi
144 -}
145 -
146 -src_compile() {
147 - cmake-utils_src_compile ocaml_all
148 -}
149 -
150 -src_test() {
151 - # respect TMPDIR!
152 - local -x LIT_PRESERVES_TMP=1
153 - cmake-utils_src_make check-llvm-bindings-ocaml
154 -}
155 -
156 -src_install() {
157 - DESTDIR="${D}" \
158 - cmake -P "${BUILD_DIR}"/bindings/ocaml/cmake_install.cmake || die
159 -
160 - dodoc bindings/ocaml/README.txt
161 -}
162
163 diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-8.0.0_rc3.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-8.0.0_rc3.ebuild
164 deleted file mode 100644
165 index 75111b867fb..00000000000
166 --- a/dev-ml/llvm-ocaml/llvm-ocaml-8.0.0_rc3.ebuild
167 +++ /dev/null
168 @@ -1,127 +0,0 @@
169 -# Copyright 1999-2019 Gentoo Authors
170 -# Distributed under the terms of the GNU General Public License v2
171 -
172 -EAPI=6
173 -
174 -: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
175 -# (needed due to CMAKE_BUILD_TYPE != Gentoo)
176 -CMAKE_MIN_VERSION=3.7.0-r1
177 -PYTHON_COMPAT=( python2_7 )
178 -
179 -inherit cmake-utils llvm multiprocessing python-any-r1
180 -
181 -MY_P=llvm-${PV/_/}.src
182 -DESCRIPTION="OCaml bindings for LLVM"
183 -HOMEPAGE="https://llvm.org/"
184 -SRC_URI="https://prereleases.llvm.org/${PV/_//}/${MY_P}.tar.xz"
185 -
186 -# Keep in sync with sys-devel/llvm
187 -ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
188 - NVPTX PowerPC Sparc SystemZ X86 XCore )
189 -ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
190 -LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
191 -
192 -LICENSE="UoI-NCSA"
193 -SLOT="0/${PV}"
194 -KEYWORDS="~amd64 ~arm ~x86"
195 -IUSE="debug test ${ALL_LLVM_TARGETS[*]}"
196 -RESTRICT="!test? ( test )"
197 -
198 -RDEPEND="
199 - >=dev-lang/ocaml-4.00.0:0=
200 - dev-ml/ocaml-ctypes:=
201 - ~sys-devel/llvm-${PV}:=[${LLVM_TARGET_USEDEPS// /,},debug?]
202 - !sys-devel/llvm[ocaml(-)]"
203 -# configparser-3.2 breaks the build (3.3 or none at all are fine)
204 -DEPEND="${RDEPEND}
205 - dev-lang/perl
206 - dev-ml/findlib
207 - test? ( dev-ml/ounit )
208 - !!<dev-python/configparser-3.3.0.2
209 - ${PYTHON_DEPS}"
210 -
211 -REQUIRED_USE="${PYTHON_REQUIRED_USE}
212 - || ( ${ALL_LLVM_TARGETS[*]} )"
213 -
214 -S=${WORKDIR}/${MY_P}
215 -
216 -# least intrusive of all
217 -CMAKE_BUILD_TYPE=RelWithDebInfo
218 -
219 -pkg_setup() {
220 - LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
221 - python-any-r1_pkg_setup
222 -}
223 -
224 -src_prepare() {
225 - # Python is needed to run tests using lit
226 - python_setup
227 -
228 - cmake-utils_src_prepare
229 -}
230 -
231 -src_configure() {
232 - local libdir=$(get_libdir)
233 - local mycmakeargs=(
234 - -DLLVM_LIBDIR_SUFFIX=${libdir#lib}
235 -
236 - -DBUILD_SHARED_LIBS=ON
237 - -DLLVM_OCAML_OUT_OF_TREE=ON
238 - -DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
239 - -DLLVM_BUILD_TESTS=$(usex test)
240 -
241 - # disable various irrelevant deps and settings
242 - -DLLVM_ENABLE_FFI=OFF
243 - -DLLVM_ENABLE_TERMINFO=OFF
244 - -DHAVE_HISTEDIT_H=NO
245 - -DWITH_POLLY=OFF
246 - -DLLVM_ENABLE_ASSERTIONS=$(usex debug)
247 - -DLLVM_ENABLE_EH=ON
248 - -DLLVM_ENABLE_RTTI=ON
249 -
250 - -DLLVM_HOST_TRIPLE="${CHOST}"
251 -
252 - # disable go bindings
253 - -DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND
254 -
255 - # TODO: ocamldoc
256 - )
257 -
258 - use test && mycmakeargs+=(
259 - -DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
260 - )
261 -
262 - # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
263 - # also: custom rules for OCaml do not work for CPPFLAGS
264 - use debug || local -x CFLAGS="${CFLAGS} -DNDEBUG"
265 - cmake-utils_src_configure
266 -
267 - local llvm_libdir=$(llvm-config --libdir)
268 - # an ugly hack; TODO: figure out a way to pass -L to ocaml...
269 - cd "${BUILD_DIR}/${libdir}" || die
270 - ln -s "${llvm_libdir}"/*.so . || die
271 -
272 - if use test; then
273 - local llvm_bindir=$(llvm-config --bindir)
274 - # Force using system-installed tools.
275 - sed -i -e "/llvm_tools_dir/s@\".*\"@\"${llvm_bindir}\"@" \
276 - "${BUILD_DIR}"/test/lit.site.cfg.py || die
277 - fi
278 -}
279 -
280 -src_compile() {
281 - cmake-utils_src_compile ocaml_all
282 -}
283 -
284 -src_test() {
285 - # respect TMPDIR!
286 - local -x LIT_PRESERVES_TMP=1
287 - cmake-utils_src_make check-llvm-bindings-ocaml
288 -}
289 -
290 -src_install() {
291 - DESTDIR="${D}" \
292 - cmake -P "${BUILD_DIR}"/bindings/ocaml/cmake_install.cmake || die
293 -
294 - dodoc bindings/ocaml/README.txt
295 -}