commit: 753e318cdd44166ea4f2e86e743a2aba8a230773 Author: Benda Xu <heroxbd <AT> gentoo <DOT> org> AuthorDate: Sun Jan 8 05:18:53 2017 +0000 Commit: Benda XU <heroxbd <AT> gentoo <DOT> org> CommitDate: Mon Jan 9 14:00:27 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=753e318c
toolchain.eclass: prefixify helper scripts. Directory prefixify part 2. Bug: 531610 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
