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 A3C1D139085 for ; Mon, 9 Jan 2017 14:00:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BA78B21C08B; Mon, 9 Jan 2017 14:00:46 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 8194521C08B for ; Mon, 9 Jan 2017 14:00:46 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2DF9A34164E for ; Mon, 9 Jan 2017 14:00:45 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C2AC52626 for ; Mon, 9 Jan 2017 14:00:43 +0000 (UTC) From: "Benda XU" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Benda XU" Message-ID: <1483970427.bf1a95b7af6073408aa5a3d40931df67d59f8d2c.heroxbd@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/toolchain.eclass X-VCS-Directories: eclass/ X-VCS-Committer: heroxbd X-VCS-Committer-Name: Benda XU X-VCS-Revision: bf1a95b7af6073408aa5a3d40931df67d59f8d2c X-VCS-Branch: master Date: Mon, 9 Jan 2017 14:00:43 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 0afc4bdc-6488-4abe-9a13-8c0b868541bf X-Archives-Hash: c42a8b7759a7d7d69b79bc64b202eb82 commit: bf1a95b7af6073408aa5a3d40931df67d59f8d2c Author: Benda Xu gentoo org> AuthorDate: Sun Jan 8 05:15:53 2017 +0000 Commit: Benda XU gentoo org> CommitDate: Mon Jan 9 14:00:27 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf1a95b7 toolchain.eclass: D->ED ROOT->EROOT replacements. Directory prefixify part 1. In addition, E/D and E/ROOT has trailing slashes. No need to write an additional slash. Bug: 531610 eclass/toolchain.eclass | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index 8e04864..40759f5 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -1735,7 +1735,7 @@ toolchain_src_install() { cd "${S}" if is_crosscompile; then - rm -rf "${D}"/usr/share/{man,info} + rm -rf "${ED}"usr/share/{man,info} rm -rf "${D}"${DATAPATH}/{man,info} else if tc_version_is_at_least 3.0 ; then @@ -1849,8 +1849,8 @@ gcc_movelibs() { # that you want to link against when building tools rather than building # code to run on the target. if tc_version_is_at_least 5 && is_crosscompile ; then - dodir "${HOSTLIBPATH}" - mv "${D}"/usr/$(get_libdir)/libcc1* "${D}${HOSTLIBPATH}" || die + dodir "${HOSTLIBPATH#${EPREFIX}}" + mv "${ED}"usr/$(get_libdir)/libcc1* "${D}${HOSTLIBPATH}" || die fi # For all the libs that are built for CTARGET, move them into the @@ -1935,7 +1935,7 @@ create_gcc_env_entry() { local gcc_envd_base="/etc/env.d/gcc/${CTARGET}-${GCC_CONFIG_VER}" local gcc_specs_file - local gcc_envd_file="${D}${gcc_envd_base}" + local gcc_envd_file="${ED}${gcc_envd_base}" if [[ -z $1 ]] ; then # I'm leaving the following commented out to remind me that it # was an insanely -bad- idea. Stuff broke. GCC_SPECS isnt unset @@ -2059,16 +2059,17 @@ toolchain_pkg_postinst() { echo # Clean up old paths - rm -f "${ROOT}"/*/rcscripts/awk/fixlafiles.awk "${ROOT}"/sbin/fix_libtool_files.sh - rmdir "${ROOT}"/*/rcscripts{/awk,} 2>/dev/null + rm -f "${EROOT}"*/rcscripts/awk/fixlafiles.awk "${EROOT}"sbin/fix_libtool_files.sh + rmdir "${EROOT}"*/rcscripts{/awk,} 2>/dev/null - mkdir -p "${ROOT}"/usr/{share/gcc-data,sbin,bin} - cp "${ROOT}/${DATAPATH}"/fixlafiles.awk "${ROOT}"/usr/share/gcc-data/ || die - cp "${ROOT}/${DATAPATH}"/fix_libtool_files.sh "${ROOT}"/usr/sbin/ || die + 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 # Since these aren't critical files and portage sucks with # handling of binpkgs, don't require these to be found - cp "${ROOT}/${DATAPATH}"/c{89,99} "${ROOT}"/usr/bin/ 2>/dev/null + cp "${ROOT}${DATAPATH}"/c{89,99} "${EROOT}"usr/bin/ 2>/dev/null fi if use regression-test ; then @@ -2091,10 +2092,10 @@ toolchain_pkg_postrm() { # clean up the cruft left behind by cross-compilers if is_crosscompile ; then - if [[ -z $(ls "${ROOT}"/etc/env.d/gcc/${CTARGET}* 2>/dev/null) ]] ; then - rm -f "${ROOT}"/etc/env.d/gcc/config-${CTARGET} - rm -f "${ROOT}"/etc/env.d/??gcc-${CTARGET} - rm -f "${ROOT}"/usr/bin/${CTARGET}-{gcc,{g,c}++}{,32,64} + if [[ -z $(ls "${EROOT}"etc/env.d/gcc/${CTARGET}* 2>/dev/null) ]] ; then + rm -f "${EROOT}"etc/env.d/gcc/config-${CTARGET} + rm -f "${EROOT}"etc/env.d/??gcc-${CTARGET} + rm -f "${EROOT}"usr/bin/${CTARGET}-{gcc,{g,c}++}{,32,64} fi return 0 fi