| 1 |
>>>>> On Wed, 20 Jun 2018, Michael Haubenwallner wrote: |
| 2 |
|
| 3 |
> Path starting with "//" is a Network path for Cygwin: |
| 4 |
> As DATAPATH starts with EPREFIX, we have to use it with ${ROOT%/}. |
| 5 |
> --- |
| 6 |
> eclass/toolchain.eclass | 6 +++--- |
| 7 |
> 1 file changed, 3 insertions(+), 3 deletions(-) |
| 8 |
|
| 9 |
> diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass |
| 10 |
> index a51d8e84f5e..bc3a80e0e8a 100644 |
| 11 |
> --- a/eclass/toolchain.eclass |
| 12 |
> +++ b/eclass/toolchain.eclass |
| 13 |
> @@ -2133,12 +2133,12 @@ toolchain_pkg_postinst() { |
| 14 |
|
| 15 |
> mkdir -p "${EROOT}"usr/{share/gcc-data,sbin,bin} |
| 16 |
> # DATAPATH has EPREFIX already, use ROOT with it |
| 17 |
> - cp "${ROOT}${DATAPATH}"/fixlafiles.awk "${EROOT}"usr/share/gcc-data/ || die |
| 18 |
> - cp "${ROOT}${DATAPATH}"/fix_libtool_files.sh "${EROOT}"usr/sbin/ || die |
| 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 |
|
| 22 |
Looks a bit short-sighted for the destinations, since EROOT lost its |
| 23 |
trailing slash in EAPI 7. So better use "${EROOT%/}/" there too. |
| 24 |
|
| 25 |
> # Since these aren't critical files and portage sucks with |
| 26 |
> # handling of binpkgs, don't require these to be found |
| 27 |
> - cp "${ROOT}${DATAPATH}"/c{89,99} "${EROOT}"usr/bin/ 2>/dev/null |
| 28 |
> + cp "${ROOT%/}${DATAPATH}"/c{89,99} "${EROOT}"usr/bin/ |
| 29 |
> # 2>/dev/null |
| 30 |
|
| 31 |
Ditto. |
| 32 |
|
| 33 |
> fi |
| 34 |
|
| 35 |
> if use regression-test ; then |
| 36 |
> -- |
| 37 |
> 2.16.1 |
Archives