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 CE0BE1381F3 for ; Wed, 10 Apr 2013 19:16:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0E200E0912; Wed, 10 Apr 2013 19:16:44 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9C7B6E0912 for ; Wed, 10 Apr 2013 19:16:43 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A305533BF00 for ; Wed, 10 Apr 2013 19:16:42 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 559) id 4ECBA2171D; Wed, 10 Apr 2013 19:16:41 +0000 (UTC) From: "Mike Frysinger (vapier)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, vapier@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass X-VCS-Repository: gentoo-x86 X-VCS-Files: toolchain.eclass X-VCS-Directories: eclass X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Message-Id: <20130410191641.4ECBA2171D@flycatcher.gentoo.org> Date: Wed, 10 Apr 2013 19:16:41 +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: 95512db9-b805-42d2-843f-aca23ace49bc X-Archives-Hash: a484f068ea67d45477c9a9389f20d990 vapier 13/04/10 19:16:41 Modified: toolchain.eclass Log: handle new gcc-4.8 MULTILIB_OSDIRNAMES logic that includes multiarch junk Revision Changes Path 1.581 eclass/toolchain.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.581&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.581&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.580&r2=1.581 Index: toolchain.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v retrieving revision 1.580 retrieving revision 1.581 diff -u -r1.580 -r1.581 --- toolchain.eclass 8 Apr 2013 06:19:00 -0000 1.580 +++ toolchain.eclass 10 Apr 2013 19:16:41 -0000 1.581 @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.580 2013/04/08 06:19:00 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.581 2013/04/10 19:16:41 vapier Exp $ # # Maintainer: Toolchain Ninjas @@ -1969,18 +1969,22 @@ esac config+="/t-linux64" + local sed_args=() + if tc_version_is_at_least 4.8 ; then + sed_args+=( -e 's:$[(]call if_multiarch[^)]*[)]::g' ) + fi if [[ ${SYMLINK_LIB} == "yes" ]] ; then einfo "updating multilib directories to be: ${libdirs}" if tc_version_is_at_least 4.7 ; then - set -- -e '/^MULTILIB_OSDIRNAMES.*lib32/s:[$][(]if.*):../lib32:' + sed_args+=( -e '/^MULTILIB_OSDIRNAMES.*lib32/s:[$][(]if.*):../lib32:' ) else - set -- -e "/^MULTILIB_OSDIRNAMES/s:=.*:= ${libdirs}:" + sed_args+=( -e "/^MULTILIB_OSDIRNAMES/s:=.*:= ${libdirs}:" ) fi else einfo "using upstream multilib; disabling lib32 autodetection" - set -- -r -e 's:[$][(]if.*,(.*)[)]:\1:' + sed_args+=( -r -e 's:[$][(]if.*,(.*)[)]:\1:' ) fi - sed -i "$@" "${S}"/gcc/config/${config} || die + sed -i "${sed_args[@]}" "${S}"/gcc/config/${config} || die } # make sure the libtool archives have libdir set to where they actually