From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 4A279138A1F for ; Tue, 29 Apr 2014 20:57:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5C96DE0B2B; Tue, 29 Apr 2014 20:57:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DA8B9E0B2B for ; Tue, 29 Apr 2014 20:57:30 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DB5BA3400CC for ; Tue, 29 Apr 2014 20:57:29 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2279) id 9E4A82004B; Tue, 29 Apr 2014 20:57:28 +0000 (UTC) From: "Michal Gorny (mgorny)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, mgorny@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog multilib-build.eclass X-VCS-Repository: gentoo-x86 X-VCS-Files: ChangeLog multilib-build.eclass X-VCS-Directories: eclass X-VCS-Committer: mgorny X-VCS-Committer-Name: Michal Gorny Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Message-Id: <20140429205728.9E4A82004B@flycatcher.gentoo.org> Date: Tue, 29 Apr 2014 20:57:28 +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: 4fcaa865-040e-485c-b0cb-15266219d2ad X-Archives-Hash: 7b0f2f7511b06dcc53227b345429b401 mgorny 14/04/29 20:57:28 Modified: ChangeLog multilib-build.eclass Log: Create ${CHOST}-prefixed tool symlinks for multilib portage, to gain better compatibility with plain multilib. Revision Changes Path 1.1230 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1230&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1230&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1229&r2=1.1230 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1229 retrieving revision 1.1230 diff -u -r1.1229 -r1.1230 --- ChangeLog 29 Apr 2014 20:56:46 -0000 1.1229 +++ ChangeLog 29 Apr 2014 20:57:28 -0000 1.1230 @@ -1,6 +1,10 @@ # ChangeLog for eclass directory # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1229 2014/04/29 20:56:46 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1230 2014/04/29 20:57:28 mgorny Exp $ + + 29 Apr 2014; Michał Górny multilib-build.eclass: + Create ${CHOST}-prefixed tool symlinks for multilib portage, to gain better + compatibility with plain multilib. 29 Apr 2014; Michał Górny multilib-build.eclass: Disable wrappers for multilib portage only. Enable them in non-multilib 1.43 eclass/multilib-build.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.43&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.43&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?r1=1.42&r2=1.43 Index: multilib-build.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- multilib-build.eclass 29 Apr 2014 20:56:46 -0000 1.42 +++ multilib-build.eclass 29 Apr 2014 20:57:28 -0000 1.43 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.42 2014/04/29 20:56:46 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.43 2014/04/29 20:57:28 mgorny Exp $ # @ECLASS: multilib-build.eclass # @MAINTAINER: @@ -295,11 +295,26 @@ [[ ${#} -le 1 ]] || die "${FUNCNAME}: too many arguments" - [[ ${COMPLETE_MULTILIB} == yes ]] && return - local root=${1:-${ED}} local f + if [[ ${COMPLETE_MULTILIB} == yes ]]; then + # symlink '${CHOST}-foo -> foo' to support abi-wrapper while + # keeping ${CHOST}-foo calls correct. + + for f in "${MULTILIB_CHOST_TOOLS[@]}"; do + # drop leading slash if it's there + f=${f#/} + + local dir=${f%/*} + local fn=${f##*/} + + ln -s "${fn}" "${root}/${dir}/${CHOST}-${fn}" || die + done + + return + fi + for f in "${MULTILIB_WRAPPED_HEADERS[@]}"; do # drop leading slash if it's there f=${f#/}