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 D5CF3138334 for ; Thu, 21 Jun 2018 08:18:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8541FE0957; Thu, 21 Jun 2018 08:18:32 +0000 (UTC) Received: from mx2.mailbox.org (mx2.mailbox.org [80.241.60.215]) (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 05C00E092D for ; Thu, 21 Jun 2018 08:18:31 +0000 (UTC) Received: from smtp2.mailbox.org (smtp2.mailbox.org [80.241.60.241]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx2.mailbox.org (Postfix) with ESMTPS id 7B2D5413EF; Thu, 21 Jun 2018 10:18:29 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp2.mailbox.org ([80.241.60.241]) by spamfilter02.heinlein-hosting.de (spamfilter02.heinlein-hosting.de [80.241.56.116]) (amavisd-new, port 10030) with ESMTP id D5ZVqU6MGNM5; Thu, 21 Jun 2018 10:18:25 +0200 (CEST) Subject: [gentoo-dev] Re: [PATCH 3/5] toolchain.eclass: avoid leading double slash To: gentoo-dev@lists.gentoo.org References: <20180620174905.7733-1-haubi@gentoo.org> <20180620174905.7733-4-haubi@gentoo.org> <23338.55249.830713.833369@a1i15.kph.uni-mainz.de> From: Michael Haubenwallner Message-ID: <8eab6b05-bc33-9bfc-bfc4-af33f3d27627@gentoo.org> Date: Thu, 21 Jun 2018 10:16:45 +0200 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 In-Reply-To: <23338.55249.830713.833369@a1i15.kph.uni-mainz.de> Content-Type: text/plain; charset=windows-1252 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Archives-Salt: 002ed23f-0310-41d8-bf97-a4456eaab500 X-Archives-Hash: 864696175ad4db74ea701fa0cef6d82b 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/