>>>>> On Wed, 20 Jun 2018, Michael Haubenwallner wrote:
> Path starting with "//" is a Network path for Cygwin:
> As DATAPATH starts with EPREFIX, we have to use it with ${ROOT%/}.
> ---
> eclass/toolchain.eclass | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
> diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
> index a51d8e84f5e..bc3a80e0e8a 100644
> --- a/eclass/toolchain.eclass
> +++ b/eclass/toolchain.eclass
> @@ -2133,12 +2133,12 @@ toolchain_pkg_postinst() {
> mkdir -p "${EROOT}"usr/{share/gcc-data,sbin,bin}
> # DATAPATH has EPREFIX already, use ROOT with it
> - cp "${ROOT}${DATAPATH}"/fixlafiles.awk
> "${EROOT}"usr/share/gcc-data/ || die
> - cp "${ROOT}${DATAPATH}"/fix_libtool_files.sh
> "${EROOT}"usr/sbin/ || die
> + cp "${ROOT%/}${DATAPATH}"/fixlafiles.awk
> "${EROOT}"usr/share/gcc-data/ || die
> + cp "${ROOT%/}${DATAPATH}"/fix_libtool_files.sh
> "${EROOT}"usr/sbin/ || die
Looks a bit short-sighted for the destinations, since EROOT lost its
trailing slash in EAPI 7. So better use "${EROOT%/}/" there too.
> # Since these aren't critical files and portage sucks with
> # handling of binpkgs, don't require these to be found
> - cp "${ROOT}${DATAPATH}"/c{89,99} "${EROOT}"usr/bin/ 2>/dev/null
> + cp "${ROOT%/}${DATAPATH}"/c{89,99} "${EROOT}"usr/bin/
> # 2>/dev/null
Ditto.
> fi
> if use regression-test ; then
> --
> 2.16.1
pgptFpdINd1Zw.pgp
Description: PGP signature
