Re: [PATCH] multilib-strict: fix for Prefix

Mike Gilbert <[email protected]> Mon, 25 Jul 2022 19:38:57 -0400

Newsgroups	gmane.linux.gentoo.portage.devel
Message-ID	<CAJ0EP428J_mU0U=nHGVqedG4nv4sHrbkii07erO0E_KgQLTF8Q@mail.gmail.com>

On Mon, Jul 25, 2022 at 12:26 PM Fabian Groffen <[email protected]> wrote:
>
> bin/install-qa-check.d/80multilib-strict: use file/find from Prefix
>
> diff --git a/bin/install-qa-check.d/80multilib-strict b/bin/install-qa-check.d/80multilib-strict
> index afd223250..3db4ecce3 100644
> --- a/bin/install-qa-check.d/80multilib-strict
> +++ b/bin/install-qa-check.d/80multilib-strict
> @@ -1,7 +1,7 @@
>  # Strict multilib directory checks
>  multilib_strict_check() {
>         if has multilib-strict ${FEATURES} && \
> -          [[ -x /usr/bin/file && -x /usr/bin/find ]] && \
> +          [[ -x ${EPREFIX}/usr/bin/file && -x ${EPREFIX}/usr/bin/find ]] && \
>            [[ -n ${MULTILIB_STRICT_DIRS} && -n ${MULTILIB_STRICT_DENY} ]]
>         then
>                 rm -f "${T}/multilib-strict.log"

Seems good to me.