From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 862B1138334 for ; Thu, 21 Jun 2018 08:40:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BFE48E09B7; Thu, 21 Jun 2018 08:40:38 +0000 (UTC) Received: from mx-out1.startmail.com (mx-out1.startmail.com [145.131.90.139]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9D11EE098F for ; Thu, 21 Jun 2018 08:40:37 +0000 (UTC) Date: Thu, 21 Jun 2018 03:39:33 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=startmail.com; s=2017-11; t=1529570436; bh=tx4Y6NeH7D8M/QCHCtQntc2/8CQKx3yTtrllQ8EFqz0=; h=Date:From:To:Subject:References:In-Reply-To:From; b=tozBgGAB0IlUT0sekkDEd6gdRg/R/zRk4dL6nAayKBtExUQlPSj/79hklpKRrJipc M1wiZrW4dlVIbbdql88eLMm+pDtkAIAdlNNKPGnjs4LWBqUnFrPAPEXq334dha4C5q RXRjolpGmFVAaseRz22h6EVu/2NfMcykqhSvmR26v966MUybMUcnp9AP22Bm6hWoYC rQ+GEeVCbDKbiMHDh2mKlGHq9arYURKgbTSYP3wAODb97v9wv0fKOudSq9DmWEdlFQ KxmcXjeeZEXvfwoNG7aE6T54HutLsyakKKi0acvZyfYTzK2+f+HxqrzBFlJO8FEi6X z2KqmReTpogHw== From: "Marty E. Plummer" To: gentoo-dev@lists.gentoo.org Subject: Re: [gentoo-dev] Re: [PATCH 3/5] toolchain.eclass: avoid leading double slash Message-ID: <20180621083932.r5x2plhm5fjuegeu@proprietary-killer> References: <20180620174905.7733-1-haubi@gentoo.org> <20180620174905.7733-4-haubi@gentoo.org> <23338.55249.830713.833369@a1i15.kph.uni-mainz.de> <8eab6b05-bc33-9bfc-bfc4-af33f3d27627@gentoo.org> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <8eab6b05-bc33-9bfc-bfc4-af33f3d27627@gentoo.org> X-Archives-Salt: 9955f58c-cb54-4c66-bef1-c8871240331d X-Archives-Hash: 3561521f2cf3fab1c295cf0c5656e569 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