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 DED40139085 for ; Sun, 8 Jan 2017 05:50:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CCD25E0D61; Sun, 8 Jan 2017 05:45:08 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 88180E0D56 for ; Sun, 8 Jan 2017 05:44:58 +0000 (UTC) Received: from cerium.km.icrr.u-tokyo.ac.jp (unknown [133.11.177.142]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: heroxbd) by smtp.gentoo.org (Postfix) with ESMTPSA id 33F7B3413FD; Sun, 8 Jan 2017 05:44:52 +0000 (UTC) From: Benda Xu To: gentoo-dev@lists.gentoo.org Cc: Benda Xu Subject: [gentoo-dev] [PATCH 4/7] toolchain.eclass: prefixify helper scripts. Date: Sun, 8 Jan 2017 14:44:04 +0900 Message-Id: <1483854247-10948-5-git-send-email-heroxbd@gentoo.org> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1483854247-10948-1-git-send-email-heroxbd@gentoo.org> References: <87r34esycm.fsf@gentoo.org> <1483854247-10948-1-git-send-email-heroxbd@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 X-Archives-Salt: 4fe940c4-f57d-490f-8f5d-d89b73fe8f99 X-Archives-Hash: 6f77af961ec9c94009956d35599c89a0 Directory prefixify part 2. --- eclass/toolchain.eclass | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index 40759f5..17950c1 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -8,7 +8,7 @@ DESCRIPTION="The GNU Compiler Collection" HOMEPAGE="https://gcc.gnu.org/" RESTRICT="strip" # cross-compilers need controlled stripping -inherit eutils fixheadtails flag-o-matic gnuconfig libtool multilib pax-utils toolchain-funcs versionator +inherit eutils fixheadtails flag-o-matic gnuconfig libtool multilib pax-utils toolchain-funcs versionator prefix if [[ ${PV} == *_pre9999* ]] ; then EGIT_REPO_URI="git://gcc.gnu.org/git/gcc.git" @@ -1764,10 +1764,10 @@ toolchain_src_install() { # Rather install the script, else portage with changing $FILESDIR # between binary and source package borks things .... if ! is_crosscompile ; then - insinto "${DATAPATH}" - newins "${GCC_FILESDIR}"/awk/fixlafiles.awk-no_gcc_la fixlafiles.awk || die - exeinto "${DATAPATH}" - doexe "${GCC_FILESDIR}"/fix_libtool_files.sh || die + insinto "${DATAPATH#${EPREFIX}}" + newins "$(prefixify_ro "${GCC_FILESDIR}"/awk/fixlafiles.awk-no_gcc_la)" fixlafiles.awk || die + exeinto "${DATAPATH#${EPREFIX}}" + doexe "$(prefixify_ro "${GCC_FILESDIR}"/fix_libtool_files.sh)" || die doexe "${GCC_FILESDIR}"/c{89,99} || die fi -- 2.8.3