ottxor 15/05/26 14:25:16 Modified: ChangeLog multilib.eclass Log: export FC/F77 for multilib support
Revision Changes Path 1.1624 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1624&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1624&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1623&r2=1.1624 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1623 retrieving revision 1.1624 diff -u -r1.1623 -r1.1624 --- ChangeLog 25 May 2015 18:18:00 -0000 1.1623 +++ ChangeLog 26 May 2015 14:25:16 -0000 1.1624 @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1623 2015/05/25 18:18:00 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1624 2015/05/26 14:25:16 ottxor Exp $ + + 26 May 2015; Christoph Junghans <[email protected]> multilib.eclass: + export FC/F77 for multilib support 25 May 2015; Andreas K. Huettel <[email protected]> perl-module.eclass: Remove long-deprecated and just dieing function stubs 1.107 eclass/multilib.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib.eclass?rev=1.107&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib.eclass?rev=1.107&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib.eclass?r1=1.106&r2=1.107 Index: multilib.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v retrieving revision 1.106 retrieving revision 1.107 diff -u -r1.106 -r1.107 --- multilib.eclass 11 Jul 2014 08:21:58 -0000 1.106 +++ multilib.eclass 26 May 2015 14:25:16 -0000 1.107 @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.106 2014/07/11 08:21:58 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.107 2015/05/26 14:25:16 ottxor Exp $ # @ECLASS: multilib.eclass # @MAINTAINER: @@ -415,7 +415,7 @@ # First restore any saved state we have laying around. if [[ ${_DEFAULT_ABI_SAVED} == "true" ]] ; then - for v in CHOST CBUILD AS CC CXX LD PKG_CONFIG_{LIBDIR,PATH} ; do + for v in CHOST CBUILD AS CC CXX F77 FC LD PKG_CONFIG_{LIBDIR,PATH} ; do vv="_abi_saved_${v}" [[ ${!vv+set} == "set" ]] && export ${v}="${!vv}" || unset ${v} unset ${vv} @@ -427,7 +427,7 @@ # screws up ccache and distcc. See #196243 for more info. if [[ ${ABI} != ${DEFAULT_ABI} ]] ; then # Back that multilib-ass up so we can restore it later - for v in CHOST CBUILD AS CC CXX LD PKG_CONFIG_{LIBDIR,PATH} ; do + for v in CHOST CBUILD AS CC CXX F77 FC LD PKG_CONFIG_{LIBDIR,PATH} ; do vv="_abi_saved_${v}" [[ ${!v+set} == "set" ]] && export ${vv}="${!v}" || unset ${vv} done @@ -438,6 +438,8 @@ export CHOST=$(get_abi_CHOST ${DEFAULT_ABI}) export CC="$(tc-getCC) $(get_abi_CFLAGS)" export CXX="$(tc-getCXX) $(get_abi_CFLAGS)" + export F77="$(tc-getF77) $(get_abi_CFLAGS)" + export FC="$(tc-getFC) $(get_abi_CFLAGS)" export LD="$(tc-getLD) $(get_abi_LDFLAGS)" export CHOST=$(get_abi_CHOST $1) export CBUILD=$(get_abi_CHOST $1)
