diff options
| author |   Andrew Savchenko <bircoph@gentoo.org> | 2015-02-18 06:19:32 +0000 |
|---|---|---|
| committer | Andrew Savchenko <bircoph@gentoo.org> | 2015-02-18 06:19:32 +0000 |
| commit | 5efa56aec292b504611ee0fbf899748f920f99dd (patch) | |
| tree | b90ccd9cbdc9cbae45ff5a740f676d0462cc5f52 /eclass | |
| parent | bump; rm old (diff) | |
| download | gentoo-2-5efa56aec292b504611ee0fbf899748f920f99dd.tar.gz gentoo-2-5efa56aec292b504611ee0fbf899748f920f99dd.tar.bz2 gentoo-2-5efa56aec292b504611ee0fbf899748f920f99dd.zip | |
Fix bug 486626: add Fortran to Gentoo override rules the same way as other compilers
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/cmake-utils.eclass | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index cf46e98cb21c..03620e8d471c 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -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 <bircoph@gentoo.org> cmake-utils.eclass: + Add Fortran compiler to Gentoo override rules, wrt bug 486626. 16 Feb 2015; Brian Evans <grknight@gentoo.org> mysql-multilib.eclass: Adjust mysql-cluster-7.3* virtual diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass index 04c1c4808081..3334a25e3e56 100644 --- a/eclass/cmake-utils.eclass +++ b/eclass/cmake-utils.eclass @@ -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 @@ enable_cmake-utils_src_configure() { 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 @@ enable_cmake-utils_src_configure() { 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 |