| 1 |
On Thu, Jun 21, 2018 at 10:16:45AM +0200, Michael Haubenwallner wrote: |
| 2 |
> On 06/21/2018 12:40 AM, Ulrich Mueller wrote: |
| 3 |
> >>>>>> On Wed, 20 Jun 2018, Michael Haubenwallner wrote: |
| 4 |
> > |
| 5 |
> >> Path starting with "//" is a Network path for Cygwin: |
| 6 |
> >> As DATAPATH starts with EPREFIX, we have to use it with ${ROOT%/}. |
| 7 |
> >> --- |
| 8 |
> >> eclass/toolchain.eclass | 6 +++--- |
| 9 |
> >> 1 file changed, 3 insertions(+), 3 deletions(-) |
| 10 |
> > |
| 11 |
> >> diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass |
| 12 |
> >> index a51d8e84f5e..bc3a80e0e8a 100644 |
| 13 |
> >> --- a/eclass/toolchain.eclass |
| 14 |
> >> +++ b/eclass/toolchain.eclass |
| 15 |
> >> @@ -2133,12 +2133,12 @@ toolchain_pkg_postinst() { |
| 16 |
> > |
| 17 |
> >> mkdir -p "${EROOT}"usr/{share/gcc-data,sbin,bin} |
| 18 |
> >> # DATAPATH has EPREFIX already, use ROOT with it |
| 19 |
> >> - cp "${ROOT}${DATAPATH}"/fixlafiles.awk "${EROOT}"usr/share/gcc-data/ || die |
| 20 |
> >> - cp "${ROOT}${DATAPATH}"/fix_libtool_files.sh "${EROOT}"usr/sbin/ || die |
| 21 |
> >> + cp "${ROOT%/}${DATAPATH}"/fixlafiles.awk "${EROOT}"usr/share/gcc-data/ || die |
| 22 |
> >> + cp "${ROOT%/}${DATAPATH}"/fix_libtool_files.sh "${EROOT}"usr/sbin/ || die |
| 23 |
> > |
| 24 |
> > Looks a bit short-sighted for the destinations, since EROOT lost its |
| 25 |
> > trailing slash in EAPI 7. So better use "${EROOT%/}/" there too. |
| 26 |
> |
| 27 |
> Well, DATAPATH already has the leading slash, and I have to avoid double slash here. |
| 28 |
> |
| 29 |
> /haubi/ |
| 30 |
> |
| 31 |
Well, still slap in the %/ to catch any extra trailing slash in ${ROOT} |
| 32 |
itself. |
Archives