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, 04 Mar 2020 18:39:14
Message-Id: 1583347129.6b87110ab23516d9f91afd75858b00bcb689f4d1.mgorny@gentoo
1 commit: 6b87110ab23516d9f91afd75858b00bcb689f4d1
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed Mar 4 18:12:31 2020 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed Mar 4 18:38:49 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b87110a
7
8 dev-ml/llvm-ocaml: Remove 10.0.0rc[12]
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-10.0.0_rc1.ebuild | 126 -------------------------
14 dev-ml/llvm-ocaml/llvm-ocaml-10.0.0_rc2.ebuild | 125 ------------------------
15 3 files changed, 253 deletions(-)
16
17 diff --git a/dev-ml/llvm-ocaml/Manifest b/dev-ml/llvm-ocaml/Manifest
18 index 8c89b6e6c22..a87e96a5947 100644
19 --- a/dev-ml/llvm-ocaml/Manifest
20 +++ b/dev-ml/llvm-ocaml/Manifest
21 @@ -1,6 +1,4 @@
22 DIST llvm-7.1.0.src.tar.xz 28313784 BLAKE2B b78d9a7fc5ef6e352e77d339e5c4eef5ccedf67c05e7abd949e72619aa8a5ed65e7e5e2008354be8e7916d75581719b99f34227838fcc86c5d0080913c2fb22c SHA512 a7dbd5693d1f2dae6b6e52893a100f9349cbfcfb25c5fdcad46364acbff0dbd3573f8fbc026c68eb9fd56335198aa94b866cc3dd7ea0cbd2cbfb5f8fe3444a7a
23 DIST llvm-8.0.1.src.tar.xz 30477608 BLAKE2B 4319c837b36111401e3b0f9659b8d875c89463bcc7816df1aefe1e3ff989860bbaa92504718f8e15416cfd9f3491c13777cd5cb661877b237b342b0e515b93f5 SHA512 82e120be5cabdfd5111aebbea68a663fe229c8861d73802d6ab09a3bf48f60de333e07e61f8fb61beaa14ac2bea24fcd74fa6f761acaf62469f536b79fcb1e16
24 -DIST llvmorg-10.0.0-rc1.tar.gz 120755822 BLAKE2B a729d37d96ba498cb865c6f708734dccb796b2caabb69167b9aa3b0e12c788f2a5980a048b99d5603da3d26af909fb31f406b4f4743cabae56c45f829a7bf695 SHA512 27137fc700971147c00ded6787eaae9f0bcf98c938fe227a5a559b38d983736f3d086f4ff6772d802c5f48a7d97a97c293261e4af88fcb5a720693b9cb5a4f02
25 -DIST llvmorg-10.0.0-rc2.tar.gz 120795019 BLAKE2B 6e701eddbd2313e777c7b37dff8455a08d3c599d01055b60afc0319373d4709deb429aac6bf9e80c4d2e2ab8ade03bf5b398b6ccd8882e4bde608d10cdbf2284 SHA512 ee571c9258a2d9fc411964f56b0b92b2e7134349ed21dbe7963eb61ef65da506e0c4f7c69259a3b6cecec23f55d24636608287ee4457ee667031e141f8f09aae
26 DIST llvmorg-10.0.0-rc3.tar.gz 120814170 BLAKE2B 432fe0c1e74d3020a269a256e6e456cbfa0b7166dd3f86df6caf3a55e1931c022285fe8afdc4d8998c729c5471acf5308abb336782ddec2ef9b0f58d1ccb5a3c SHA512 aad1df86063612d20c48ea7046940330fe2ac572a146be22ff71d9e65fa3438184cb39a2533fc6afd1e74df26909a9f0d24ebcd7d62e74728cfd81e447f2ffbf
27 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
28
29 diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-10.0.0_rc1.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-10.0.0_rc1.ebuild
30 deleted file mode 100644
31 index 0f9b2f61d74..00000000000
32 --- a/dev-ml/llvm-ocaml/llvm-ocaml-10.0.0_rc1.ebuild
33 +++ /dev/null
34 @@ -1,126 +0,0 @@
35 -# Copyright 1999-2020 Gentoo Authors
36 -# Distributed under the terms of the GNU General Public License v2
37 -
38 -EAPI=7
39 -
40 -PYTHON_COMPAT=( python3_{6,7} )
41 -inherit cmake-utils llvm llvm.org multiprocessing python-any-r1
42 -
43 -DESCRIPTION="OCaml bindings for LLVM"
44 -HOMEPAGE="https://llvm.org/"
45 -LLVM_COMPONENTS=( llvm )
46 -llvm.org_set_globals
47 -
48 -# Keep in sync with sys-devel/llvm
49 -ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC AVR VE )
50 -ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
51 - NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore
52 - "${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" )
53 -ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
54 -LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
55 -
56 -LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
57 -SLOT="0/${PV}"
58 -KEYWORDS=""
59 -IUSE="debug test ${ALL_LLVM_TARGETS[*]}"
60 -REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
61 -RESTRICT="!test? ( test )"
62 -
63 -RDEPEND="
64 - >=dev-lang/ocaml-4.00.0:0=
65 - dev-ml/ocaml-ctypes:=
66 - ~sys-devel/llvm-${PV}:=[${LLVM_TARGET_USEDEPS// /,},debug?]
67 - !sys-devel/llvm[ocaml(-)]"
68 -DEPEND="${RDEPEND}"
69 -BDEPEND="
70 - dev-lang/perl
71 - dev-ml/findlib
72 - test? ( dev-ml/ounit )
73 - ${PYTHON_DEPS}"
74 -
75 -# least intrusive of all
76 -CMAKE_BUILD_TYPE=RelWithDebInfo
77 -
78 -pkg_setup() {
79 - LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
80 - python-any-r1_pkg_setup
81 -}
82 -
83 -src_prepare() {
84 - # Python is needed to run tests using lit
85 - python_setup
86 -
87 - cmake-utils_src_prepare
88 -}
89 -
90 -src_configure() {
91 - local libdir=$(get_libdir)
92 - local mycmakeargs=(
93 - -DLLVM_LIBDIR_SUFFIX=${libdir#lib}
94 -
95 - -DBUILD_SHARED_LIBS=OFF
96 - -DLLVM_BUILD_LLVM_DYLIB=ON
97 - -DLLVM_LINK_LLVM_DYLIB=ON
98 - -DLLVM_OCAML_OUT_OF_TREE=ON
99 -
100 - # cheap hack: LLVM combines both anyway, and the only difference
101 - # is that the former list is explicitly verified at cmake time
102 - -DLLVM_TARGETS_TO_BUILD=""
103 - -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
104 - -DLLVM_BUILD_TESTS=$(usex test)
105 -
106 - # disable various irrelevant deps and settings
107 - -DLLVM_ENABLE_FFI=OFF
108 - -DLLVM_ENABLE_TERMINFO=OFF
109 - -DHAVE_HISTEDIT_H=NO
110 - -DWITH_POLLY=OFF
111 - -DLLVM_ENABLE_ASSERTIONS=$(usex debug)
112 - -DLLVM_ENABLE_EH=ON
113 - -DLLVM_ENABLE_RTTI=ON
114 -
115 - -DLLVM_HOST_TRIPLE="${CHOST}"
116 -
117 - # disable go bindings
118 - -DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND
119 -
120 - # TODO: ocamldoc
121 - )
122 -
123 - use test && mycmakeargs+=(
124 - -DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
125 - )
126 -
127 - # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
128 - # also: custom rules for OCaml do not work for CPPFLAGS
129 - use debug || local -x CFLAGS="${CFLAGS} -DNDEBUG"
130 - cmake-utils_src_configure
131 -
132 - local llvm_libdir=$(llvm-config --libdir)
133 - # an ugly hack; TODO: figure out a way to pass -L to ocaml...
134 - cd "${BUILD_DIR}/${libdir}" || die
135 - ln -s "${llvm_libdir}"/*.so . || die
136 -
137 - if use test; then
138 - local llvm_bindir=$(llvm-config --bindir)
139 - # Force using system-installed tools.
140 - sed -i -e "/llvm_tools_dir/s@\".*\"@\"${llvm_bindir}\"@" \
141 - "${BUILD_DIR}"/test/lit.site.cfg.py || die
142 - fi
143 -}
144 -
145 -src_compile() {
146 - cmake-utils_src_compile ocaml_all
147 -}
148 -
149 -src_test() {
150 - # respect TMPDIR!
151 - local -x LIT_PRESERVES_TMP=1
152 - cmake-utils_src_make check-llvm-bindings-ocaml
153 -}
154 -
155 -src_install() {
156 - DESTDIR="${D}" \
157 - cmake -P "${BUILD_DIR}"/bindings/ocaml/cmake_install.cmake || die
158 -
159 - dodoc bindings/ocaml/README.txt
160 -}
161
162 diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-10.0.0_rc2.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-10.0.0_rc2.ebuild
163 deleted file mode 100644
164 index 8a7efe8fca4..00000000000
165 --- a/dev-ml/llvm-ocaml/llvm-ocaml-10.0.0_rc2.ebuild
166 +++ /dev/null
167 @@ -1,125 +0,0 @@
168 -# Copyright 1999-2020 Gentoo Authors
169 -# Distributed under the terms of the GNU General Public License v2
170 -
171 -EAPI=7
172 -
173 -PYTHON_COMPAT=( python3_{6,7,8} )
174 -inherit cmake-utils llvm llvm.org multiprocessing python-any-r1
175 -
176 -DESCRIPTION="OCaml bindings for LLVM"
177 -HOMEPAGE="https://llvm.org/"
178 -LLVM_COMPONENTS=( llvm )
179 -llvm.org_set_globals
180 -
181 -# Keep in sync with sys-devel/llvm
182 -ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC AVR )
183 -ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
184 - NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore
185 - "${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" )
186 -ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
187 -LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
188 -
189 -LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
190 -SLOT="0/${PV}"
191 -KEYWORDS=""
192 -IUSE="debug test ${ALL_LLVM_TARGETS[*]}"
193 -REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
194 -RESTRICT="!test? ( test )"
195 -
196 -RDEPEND="
197 - >=dev-lang/ocaml-4.00.0:0=
198 - dev-ml/ocaml-ctypes:=
199 - ~sys-devel/llvm-${PV}:=[${LLVM_TARGET_USEDEPS// /,},debug?]
200 - !sys-devel/llvm[ocaml(-)]"
201 -DEPEND="${RDEPEND}"
202 -BDEPEND="
203 - dev-lang/perl
204 - dev-ml/findlib
205 - test? ( dev-ml/ounit )
206 - ${PYTHON_DEPS}"
207 -
208 -# least intrusive of all
209 -CMAKE_BUILD_TYPE=RelWithDebInfo
210 -
211 -pkg_setup() {
212 - LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
213 - python-any-r1_pkg_setup
214 -}
215 -
216 -src_prepare() {
217 - # Python is needed to run tests using lit
218 - python_setup
219 -
220 - cmake-utils_src_prepare
221 -}
222 -
223 -src_configure() {
224 - local libdir=$(get_libdir)
225 - local mycmakeargs=(
226 - -DLLVM_LIBDIR_SUFFIX=${libdir#lib}
227 -
228 - -DBUILD_SHARED_LIBS=OFF
229 - -DLLVM_BUILD_LLVM_DYLIB=ON
230 - -DLLVM_LINK_LLVM_DYLIB=ON
231 - -DLLVM_OCAML_OUT_OF_TREE=ON
232 -
233 - # cheap hack: LLVM combines both anyway, and the only difference
234 - # is that the former list is explicitly verified at cmake time
235 - -DLLVM_TARGETS_TO_BUILD=""
236 - -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
237 - -DLLVM_BUILD_TESTS=$(usex test)
238 -
239 - # disable various irrelevant deps and settings
240 - -DLLVM_ENABLE_FFI=OFF
241 - -DLLVM_ENABLE_TERMINFO=OFF
242 - -DHAVE_HISTEDIT_H=NO
243 - -DLLVM_ENABLE_ASSERTIONS=$(usex debug)
244 - -DLLVM_ENABLE_EH=ON
245 - -DLLVM_ENABLE_RTTI=ON
246 -
247 - -DLLVM_HOST_TRIPLE="${CHOST}"
248 -
249 - # disable go bindings
250 - -DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND
251 -
252 - # TODO: ocamldoc
253 - )
254 -
255 - use test && mycmakeargs+=(
256 - -DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
257 - )
258 -
259 - # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
260 - # also: custom rules for OCaml do not work for CPPFLAGS
261 - use debug || local -x CFLAGS="${CFLAGS} -DNDEBUG"
262 - cmake-utils_src_configure
263 -
264 - local llvm_libdir=$(llvm-config --libdir)
265 - # an ugly hack; TODO: figure out a way to pass -L to ocaml...
266 - cd "${BUILD_DIR}/${libdir}" || die
267 - ln -s "${llvm_libdir}"/*.so . || die
268 -
269 - if use test; then
270 - local llvm_bindir=$(llvm-config --bindir)
271 - # Force using system-installed tools.
272 - sed -i -e "/llvm_tools_dir/s@\".*\"@\"${llvm_bindir}\"@" \
273 - "${BUILD_DIR}"/test/lit.site.cfg.py || die
274 - fi
275 -}
276 -
277 -src_compile() {
278 - cmake-utils_src_compile ocaml_all
279 -}
280 -
281 -src_test() {
282 - # respect TMPDIR!
283 - local -x LIT_PRESERVES_TMP=1
284 - cmake-utils_src_make check-llvm-bindings-ocaml
285 -}
286 -
287 -src_install() {
288 - DESTDIR="${D}" \
289 - cmake -P "${BUILD_DIR}"/bindings/ocaml/cmake_install.cmake || die
290 -
291 - dodoc bindings/ocaml/README.txt
292 -}