Gentoo Archives: gentoo-dev

From: Michael Haubenwallner <haubi@g.o>
To: gentoo-dev@l.g.o
Cc: Michael Haubenwallner <haubi@g.o>
Subject: [gentoo-dev] [PATCH 3/5] toolchain.eclass: avoid leading double slash
Date: Wed, 20 Jun 2018 17:50:42
Message-Id: 20180620174905.7733-4-haubi@gentoo.org
In Reply to: [gentoo-dev] [PATCH 0/5] toolchain.eclass: Prefix patches, Cygwin related by Michael Haubenwallner
1 Path starting with "//" is a Network path for Cygwin:
2 As DATAPATH starts with EPREFIX, we have to use it with ${ROOT%/}.
3 ---
4 eclass/toolchain.eclass | 6 +++---
5 1 file changed, 3 insertions(+), 3 deletions(-)
6
7 diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
8 index a51d8e84f5e..bc3a80e0e8a 100644
9 --- a/eclass/toolchain.eclass
10 +++ b/eclass/toolchain.eclass
11 @@ -2133,12 +2133,12 @@ toolchain_pkg_postinst() {
12
13 mkdir -p "${EROOT}"usr/{share/gcc-data,sbin,bin}
14 # DATAPATH has EPREFIX already, use ROOT with it
15 - cp "${ROOT}${DATAPATH}"/fixlafiles.awk "${EROOT}"usr/share/gcc-data/ || die
16 - cp "${ROOT}${DATAPATH}"/fix_libtool_files.sh "${EROOT}"usr/sbin/ || die
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
20 # Since these aren't critical files and portage sucks with
21 # handling of binpkgs, don't require these to be found
22 - cp "${ROOT}${DATAPATH}"/c{89,99} "${EROOT}"usr/bin/ 2>/dev/null
23 + cp "${ROOT%/}${DATAPATH}"/c{89,99} "${EROOT}"usr/bin/ 2>/dev/null
24 fi
25
26 if use regression-test ; then
27 --
28 2.16.1

Replies