diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-07-09 15:43:36 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-07-09 15:43:36 +0100 |
| commit | 2719f73b6813d11d13a9650cdd2ab8ec6e69385d (patch) | |
| tree | 8c816148bcbd22757d892089c989ae614eae4f5a /eclass/findlib.eclass | |
| parent | 0f558761aa2dee1017b4751e4017205e015a9560 (diff) | |
gentoo resync : 09.07.2022
Diffstat (limited to 'eclass/findlib.eclass')
| -rw-r--r-- | eclass/findlib.eclass | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/eclass/findlib.eclass b/eclass/findlib.eclass index 0e14514e298f..52e3655b3e84 100644 --- a/eclass/findlib.eclass +++ b/eclass/findlib.eclass @@ -6,13 +6,13 @@ # ML <ml@gentoo.org> # @AUTHOR: # Original author: Matthieu Sozeau <mattam@gentoo.org> (retired) -# @SUPPORTED_EAPIS: 6 7 +# @SUPPORTED_EAPIS: 6 7 8 # @BLURB: ocamlfind (a.k.a. findlib) eclass # @DESCRIPTION: # ocamlfind (a.k.a. findlib) eclass case ${EAPI:-0} in - [67]) ;; + [678]) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac @@ -26,11 +26,14 @@ QA_FLAGS_IGNORED='.*' IUSE="+ocamlopt" # From this findlib version, there is proper stublibs support. -DEPEND=">=dev-ml/findlib-1.0.4-r1" +DEPEND=">=dev-ml/findlib-1.0.4-r1[ocamlopt?]" [[ ${FINDLIB_USE} ]] && DEPEND="${FINDLIB_USE}? ( ${DEPEND} )" RDEPEND="dev-lang/ocaml:=[ocamlopt?]" [[ ${FINDLIB_USE} ]] && RDEPEND="${FINDLIB_USE}? ( ${RDEPEND} )" +# @FUNCTION: check_ocamlfind +# @DESCRIPTION: +# Die if ocamlfind is not found check_ocamlfind() { if [ ! -x "${EPREFIX}"/usr/bin/ocamlfind ] ; then eerror "In ${ECLASS}: could not find the ocamlfind executable" @@ -45,8 +48,6 @@ check_ocamlfind() { # We use the stublibs style, so no ld.conf needs to be # updated when a package installs C shared libraries. findlib_src_preinst() { - has "${EAPI:-0}" 0 1 2 && ! use prefix && EPREFIX= - has "${EAPI:-0}" 0 1 2 && use !prefix && ED="${D}" check_ocamlfind # destdir is the ocaml sitelib |