[prev in list] [next in list] [prev in thread] [next in thread] 

List:       gentoo-dev
Subject:    Re: [gentoo-dev] Proposed changes to findlib.eclass
From:       Anna <cyber+gentoo () sysrq ! in>
Date:       2022-06-30 18:31:55
Message-ID: Yr3sG72Y85OrUvSn () sysrq ! in
[Download RAW message or body]

On 2022-06-30 20:25, Alfredo Tupone wrote:
> dev-ml/findlib needs ocamlopt to build other packages with ocamlopt
> (native code)
> 
> Alfredo

> diff --git a/eclass/findlib.eclass b/eclass/findlib.eclass
> index 0e14514e298..f6c2657ecdb 100644
> --- a/eclass/findlib.eclass
> +++ b/eclass/findlib.eclass
> @@ -14,35 +14,38 @@
>  case ${EAPI:-0} in
>  	[67]) ;;
>  	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
>  esac

EAPI 8 support?

>  if [[ -z ${_FINDLIB_ECLASS} ]] ; then
>  _FINDLIB_ECLASS=1
>  
>  # Do not complain about CFLAGS etc since ML projects do not use them.
>  QA_FLAGS_IGNORED='.*'
>  
>  # Required to use the ocamlopt? dep in RDEPEND below
>  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

Bash tests.

>  		eerror "In ${ECLASS}: could not find the ocamlfind executable"
>  		eerror "Please report this bug on Gentoo's Bugzilla, assigning to ml@gentoo.org"
>  		die "ocamlfind executable not found"
>  	fi
>  }
>  
>  # @FUNCTION: findlib_src_preinst
>  # @DESCRIPTION:
>  # Prepare the image for a findlib installation.
>  # 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=

This line should be dropped since these EAPIs are not supported.

[prev in list] [next in list] [prev in thread] [next in thread]