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 C380713832F for ; Thu, 21 Jul 2016 02:23:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 935CE21C2B6; Thu, 21 Jul 2016 02:23:18 +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 0B2EB21C028 for ; Thu, 21 Jul 2016 02:23:17 +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 A2EC1340E02 for ; Thu, 21 Jul 2016 02:23:15 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8DF23244C for ; Thu, 21 Jul 2016 02:23:10 +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: <1469067373.f237ba70585b97ba8e45882bb2f5926323b3e658.heroxbd@gentoo> Subject: [gentoo-commits] dev/heroxbd:master commit in: eclass/ X-VCS-Repository: dev/heroxbd X-VCS-Files: eclass/toolchain.eclass X-VCS-Directories: eclass/ X-VCS-Committer: heroxbd X-VCS-Committer-Name: Benda XU X-VCS-Revision: f237ba70585b97ba8e45882bb2f5926323b3e658 X-VCS-Branch: master Date: Thu, 21 Jul 2016 02:23:10 +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: c61cb4eb-121f-47c9-9562-b09c1a8217fe X-Archives-Hash: a74039ef1a997c3755f1419c823fb25e Message-ID: <20160721022310.YUl1SwT_bSIP-vfnh-e_Iqe8kk-okecTAiMU_WwpEHQ@z> commit: f237ba70585b97ba8e45882bb2f5926323b3e658 Author: Benda Xu gentoo org> AuthorDate: Thu Jul 21 02:16:13 2016 +0000 Commit: Benda XU gentoo org> CommitDate: Thu Jul 21 02:16:13 2016 +0000 URL: https://gitweb.gentoo.org/dev/heroxbd.git/commit/?id=f237ba70 toolchain.eclass: a couple of ED fixes. eclass/toolchain.eclass | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index b6df2da..5a4c92d 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -1711,7 +1711,7 @@ toolchain_src_install() { # Now do the fun stripping stuff env RESTRICT="" CHOST=${CHOST} prepstrip "${D}${BINPATH}" is_crosscompile && \ - env RESTRICT="" CHOST=${CHOST} prepstrip "${D}/${HOSTLIBPATH}" + env RESTRICT="" CHOST=${CHOST} prepstrip "${D}${HOSTLIBPATH}" env RESTRICT="" CHOST=${CTARGET} prepstrip "${D}${LIBPATH}" # gcc used to install helper binaries in lib/ but then moved to libexec/ [[ -d ${D}${PREFIX}/libexec/gcc ]] && \ @@ -1719,7 +1719,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 @@ -1729,10 +1729,10 @@ toolchain_src_install() { fi fi has noinfo ${FEATURES} \ - && rm -r "${D}/${DATAPATH}"/info \ + && rm -r "${D}${DATAPATH}"/info \ || prepinfo "${DATAPATH#${EPREFIX}}" has noman ${FEATURES} \ - && rm -r "${D}/${DATAPATH}"/man \ + && rm -r "${D}${DATAPATH}"/man \ || prepman "${DATAPATH#${EPREFIX}}" fi # prune empty dirs left behind @@ -1834,7 +1834,7 @@ gcc_movelibs() { # code to run on the target. if tc_version_is_at_least 5 && is_crosscompile ; then dodir "${HOSTLIBPATH#${EPREFIX}}" - mv "${ED}"/usr/$(get_libdir)/libcc1* "${D}${HOSTLIBPATH}" || die + mv "${ED}"usr/$(get_libdir)/libcc1* "${D}${HOSTLIBPATH}" || die fi # For all the libs that are built for CTARGET, move them into the