bircoph 15/02/18 06:19:32 Modified: ChangeLog cmake-utils.eclass Log: Fix bug 486626: add Fortran to Gentoo override rules the same way as other compilers
Revision Changes Path 1.1538 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1538&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1538&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1537&r2=1.1538 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1537 retrieving revision 1.1538 diff -u -r1.1537 -r1.1538 --- ChangeLog 16 Feb 2015 17:25:14 -0000 1.1537 +++ ChangeLog 18 Feb 2015 06:19:32 -0000 1.1538 @@ -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.1537 2015/02/16 17:25:14 grknight Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1538 2015/02/18 06:19:32 bircoph Exp $ + + 18 Feb 2015; Andrew Savchenko <birc...@gentoo.org> cmake-utils.eclass: + Add Fortran compiler to Gentoo override rules, wrt bug 486626. 16 Feb 2015; Brian Evans <grkni...@gentoo.org> mysql-multilib.eclass: Adjust mysql-cluster-7.3* virtual 1.114 eclass/cmake-utils.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/cmake-utils.eclass?rev=1.114&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/cmake-utils.eclass?rev=1.114&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/cmake-utils.eclass?r1=1.113&r2=1.114 Index: cmake-utils.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/cmake-utils.eclass,v retrieving revision 1.113 retrieving revision 1.114 diff -u -r1.113 -r1.114 --- cmake-utils.eclass 18 Dec 2014 16:39:08 -0000 1.113 +++ cmake-utils.eclass 18 Feb 2015 06:19:32 -0000 1.114 @@ -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/cmake-utils.eclass,v 1.113 2014/12/18 16:39:08 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/cmake-utils.eclass,v 1.114 2015/02/18 06:19:32 bircoph Exp $ # @ECLASS: cmake-utils.eclass # @MAINTAINER: @@ -462,6 +462,7 @@ SET (CMAKE_ASM_COMPILE_OBJECT "<CMAKE_C_COMPILER> <DEFINES> ${CFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "ASM compile command" FORCE) SET (CMAKE_C_COMPILE_OBJECT "<CMAKE_C_COMPILER> <DEFINES> ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C compile command" FORCE) SET (CMAKE_CXX_COMPILE_OBJECT "<CMAKE_CXX_COMPILER> <DEFINES> ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C++ compile command" FORCE) + SET (CMAKE_Fortran_COMPILE_OBJECT "<CMAKE_Fortran_COMPILER> <DEFINES> ${FCFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "Fortran compile command" FORCE) SET (CMAKE_RANLIB $(type -P $(tc-getRANLIB)) CACHE FILEPATH "Archive index generator" FORCE) SET (PKG_CONFIG_EXECUTABLE $(type -P $(tc-getPKG_CONFIG)) CACHE FILEPATH "pkg-config executable" FORCE) _EOF_ @@ -470,6 +471,7 @@ cat > ${toolchain_file} <<- _EOF_ SET (CMAKE_C_COMPILER $(tc-getCC)) SET (CMAKE_CXX_COMPILER $(tc-getCXX)) + SET (CMAKE_Fortran_COMPILER $(tc-getFC)) _EOF_ if tc-is-cross-compiler; then
