Re: [gentoo-dev] Re: [PATCH 3/5] toolchain.eclass: avoid leading double slash

["Marty E. Plummer" <hanetzer@startmail.com>]

On Thu, Jun 21, 2018 at 10:16:45AM +0200, Michael Haubenwallner wrote:
> On 06/21/2018 12:40 AM, Ulrich Mueller wrote:
> >>>>>> 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.
> 
> Well, DATAPATH already has the leading slash, and I have to avoid double slash here.
> 
> /haubi/
> 
 - 		mkdir -p "${EROOT}"usr/{share/gcc-data,sbin,bin}
 + 		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