| 1 |
commit: b1be4a4487d92cdabd348712f5bb9d102b512c92 |
| 2 |
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jul 1 06:47:16 2022 +0000 |
| 4 |
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jul 1 06:47:16 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1be4a44 |
| 7 |
|
| 8 |
findlib.eclass: add ocamlopt? use dep to findlib |
| 9 |
|
| 10 |
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org> |
| 11 |
|
| 12 |
eclass/findlib.eclass | 9 ++++++--- |
| 13 |
1 file changed, 6 insertions(+), 3 deletions(-) |
| 14 |
|
| 15 |
diff --git a/eclass/findlib.eclass b/eclass/findlib.eclass |
| 16 |
index 0e14514e298f..dae19d91c37d 100644 |
| 17 |
--- a/eclass/findlib.eclass |
| 18 |
+++ b/eclass/findlib.eclass |
| 19 |
@@ -6,13 +6,13 @@ |
| 20 |
# ML <ml@g.o> |
| 21 |
# @AUTHOR: |
| 22 |
# Original author: Matthieu Sozeau <mattam@g.o> (retired) |
| 23 |
-# @SUPPORTED_EAPIS: 6 7 |
| 24 |
+# @SUPPORTED_EAPIS: 6 7 8 |
| 25 |
# @BLURB: ocamlfind (a.k.a. findlib) eclass |
| 26 |
# @DESCRIPTION: |
| 27 |
# ocamlfind (a.k.a. findlib) eclass |
| 28 |
|
| 29 |
case ${EAPI:-0} in |
| 30 |
- [67]) ;; |
| 31 |
+ [678]) ;; |
| 32 |
*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; |
| 33 |
esac |
| 34 |
|
| 35 |
@@ -26,11 +26,14 @@ QA_FLAGS_IGNORED='.*' |
| 36 |
IUSE="+ocamlopt" |
| 37 |
|
| 38 |
# From this findlib version, there is proper stublibs support. |
| 39 |
-DEPEND=">=dev-ml/findlib-1.0.4-r1" |
| 40 |
+DEPEND=">=dev-ml/findlib-1.0.4-r1[ocamlopt?]" |
| 41 |
[[ ${FINDLIB_USE} ]] && DEPEND="${FINDLIB_USE}? ( ${DEPEND} )" |
| 42 |
RDEPEND="dev-lang/ocaml:=[ocamlopt?]" |
| 43 |
[[ ${FINDLIB_USE} ]] && RDEPEND="${FINDLIB_USE}? ( ${RDEPEND} )" |
| 44 |
|
| 45 |
+# @FUNCTION: check_ocamlfind |
| 46 |
+# @DESCRIPTION: |
| 47 |
+# Die if ocamlfind is not found |
| 48 |
check_ocamlfind() { |
| 49 |
if [ ! -x "${EPREFIX}"/usr/bin/ocamlfind ] ; then |
| 50 |
eerror "In ${ECLASS}: could not find the ocamlfind executable" |
Archives