Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Sat, 19 Jun 2021 22:10:50
Message-Id: 1624140641.94105a4ed58bb5977ccbbcbe1084f04e3218e08a.sam@gentoo
1 commit: 94105a4ed58bb5977ccbbcbe1084f04e3218e08a
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jun 19 22:07:27 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Sat Jun 19 22:10:41 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94105a4e
7
8 findlib.eclass: define IUSE="ocamlopt"
9
10 Fixes failures such as:
11 ```
12 dev-ml/camlbz2-0.7.0::gentoo (masked by: invalid: RDEPEND: USE flag 'ocamlopt'
13 referenced in conditional 'ocamlopt?' in atom 'dev-lang/ocaml:=[ocamlopt?]' is not in IUSE)
14 ```
15 in findlib.eclass consumers lacking IUSE="ocamlopt".
16
17 Fixes: f498bcbd7c3fd328bd5f66f3286521b6db926f5e
18 Signed-off-by: Sam James <sam <AT> gentoo.org>
19
20 eclass/findlib.eclass | 6 ++++--
21 1 file changed, 4 insertions(+), 2 deletions(-)
22
23 diff --git a/eclass/findlib.eclass b/eclass/findlib.eclass
24 index 9c19ca96dda..fd5442b99d5 100644
25 --- a/eclass/findlib.eclass
26 +++ b/eclass/findlib.eclass
27 @@ -1,5 +1,4 @@
28 -# Copyright 1999-2021 Gentoo Authors
29 -# Distributed under the terms of the GNU General Public License v2
30 +# Copyright 1999-2021 Gentoo Author# Distributed under the terms of the GNU General Public License v2
31
32 # @ECLASS: findlib.eclass
33 # @MAINTAINER:
34 @@ -13,6 +12,9 @@
35 # Do not complain about CFLAGS etc since ML projects do not use them.
36 QA_FLAGS_IGNORED='.*'
37
38 +# Required to use the ocamlopt? dep in RDEPEND below
39 +IUSE="ocamlopt"
40 +
41 # From this findlib version, there is proper stublibs support.
42 DEPEND=">=dev-ml/findlib-1.0.4-r1"
43 [[ ${FINDLIB_USE} ]] && DEPEND="${FINDLIB_USE}? ( ${DEPEND} )"