From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RY1Mv-00020x-BC for garchives@archives.gentoo.org; Tue, 06 Dec 2011 20:12:01 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1B40921C0B6; Tue, 6 Dec 2011 20:11:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id D0A7E21C0B6 for ; Tue, 6 Dec 2011 20:11:52 +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 1A46D6443E for ; Tue, 6 Dec 2011 20:11:52 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 559) id E13642004B; Tue, 6 Dec 2011 20:11:50 +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 Message-Id: <20111206201150.E13642004B@flycatcher.gentoo.org> Date: Tue, 6 Dec 2011 20:11:50 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 387e0f0a-5ea2-40ab-8659-65152be4e6be X-Archives-Hash: d22bc0b57953c0a5b5f48098c9271d5d vapier 11/12/06 20:11:50 Modified: toolchain.eclass Log: fix multilib assumptions when setting up LDPATH (that there is only "32= " and "64" subdirs), and make it work regardless of active profile Revision Changes Path 1.503 eclass/toolchain.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.e= class?rev=3D1.503&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.e= class?rev=3D1.503&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.e= class?r1=3D1.502&r2=3D1.503 Index: toolchain.eclass =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v retrieving revision 1.502 retrieving revision 1.503 diff -u -r1.502 -r1.503 --- toolchain.eclass 6 Dec 2011 05:22:24 -0000 1.502 +++ toolchain.eclass 6 Dec 2011 20:11:50 -0000 1.503 @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.502 2011/= 12/06 05:22:24 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.503 2011/= 12/06 20:11:50 vapier Exp $ # # Maintainer: Toolchain Ninjas =20 @@ -468,39 +468,21 @@ echo "ROOTPATH=3D\"${BINPATH}\"" >> ${gcc_envd_file} echo "GCC_PATH=3D\"${BINPATH}\"" >> ${gcc_envd_file} =20 - if is_multilib ; then - LDPATH=3D"${LIBPATH}" - for path in 32 64 ; do - [[ -d ${D}${LIBPATH}/${path} ]] && LDPATH=3D"${LDPATH}:${LIBPATH}/${p= ath}" - done - else - local MULTIDIR - LDPATH=3D"${LIBPATH}" - - # We want to list the default ABI's LIBPATH first so libtool - # searches that directory first. This is a temporary - # workaround for libtool being stupid and using .la's from - # conflicting ABIs by using the first one in the search path - - local abi=3D${DEFAULT_ABI} - local MULTIDIR=3D$($(XGCC) $(get_abi_CFLAGS ${abi}) --print-multi-dire= ctory) - if [[ ${MULTIDIR} =3D=3D "." ]] ; then - LDPATH=3D${LIBPATH} - else - LDPATH=3D${LIBPATH}/${MULTIDIR} - fi - - for abi in $(get_all_abis) ; do - [[ ${abi} =3D=3D ${DEFAULT_ABI} ]] && continue + # We want to list the default ABI's LIBPATH first so libtool + # searches that directory first. This is a temporary + # workaround for libtool being stupid and using .la's from + # conflicting ABIs by using the first one in the search path + local abi=3D${DEFAULT_ABI} + local MULTIDIR=3D$($(XGCC) $(get_abi_CFLAGS ${abi}) --print-multi-direc= tory) + local LDPATH=3D${LIBPATH} + [[ ${MULTIDIR} !=3D "." ]] && LDPATH+=3D/${MULTIDIR} + for abi in $(get_all_abis) ; do + [[ ${abi} =3D=3D ${DEFAULT_ABI} ]] && continue =20 - MULTIDIR=3D$($(XGCC) $(get_abi_CFLAGS ${abi}) --print-multi-directory= ) - if [[ ${MULTIDIR} =3D=3D "." ]] ; then - LDPATH=3D${LDPATH}:${LIBPATH} - else - LDPATH=3D${LDPATH}:${LIBPATH}/${MULTIDIR} - fi - done - fi + MULTIDIR=3D$($(XGCC) $(get_abi_CFLAGS ${abi}) --print-multi-directory) + LDPATH+=3D:${LIBPATH} + [[ ${MULTIDIR} !=3D "." ]] && LDPATH+=3D/${MULTIDIR} + done =20 echo "LDPATH=3D\"${LDPATH}\"" >> ${gcc_envd_file} echo "MANPATH=3D\"${DATAPATH}/man\"" >> ${gcc_envd_file} @@ -1381,6 +1363,7 @@ } =20 toolchain_src_compile() { + multilib_env ${CTARGET} gcc_do_filter_flags einfo "CFLAGS=3D\"${CFLAGS}\"" einfo "CXXFLAGS=3D\"${CXXFLAGS}\""