diff options
| author |   Michael Palimaka <kensington@gentoo.org> | 2012-10-17 14:09:10 +0000 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2012-10-17 14:09:10 +0000 |
| commit | b937a8550e8f00781e6f8a397e13e6296597ae8f (patch) | |
| tree | f62af7535070db3c28850d22acf5f3bd255e3286 /eclass | |
| parent | Stable for HPPA (bug #394809). (diff) | |
| download | gentoo-2-b937a8550e8f00781e6f8a397e13e6296597ae8f.tar.gz gentoo-2-b937a8550e8f00781e6f8a397e13e6296597ae8f.tar.bz2 gentoo-2-b937a8550e8f00781e6f8a397e13e6296597ae8f.zip | |
Respect AR and RANLIB, wrt bug #436070.
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 20f6a2168dc2..828842cc8c2b 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.450 2012/10/16 20:18:42 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.451 2012/10/17 14:09:10 kensington Exp $ + + 17 Oct 2012; Michael Palimaka <kensington@gentoo.org> cmake-utils.eclass: + Respect AR and RANLIB, wrt bug #436070. 16 Oct 2012; Justin Lecher <jlec@gentoo.org> fortran-2.eclass: Unset FC and F77 if no fortran support is wanted diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass index f0bc23ac5ca7..3b0cc01719ac 100644 --- a/eclass/cmake-utils.eclass +++ b/eclass/cmake-utils.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/cmake-utils.eclass,v 1.83 2012/10/02 08:14:36 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/cmake-utils.eclass,v 1.84 2012/10/17 14:09:10 kensington Exp $ # @ECLASS: cmake-utils.eclass # @MAINTAINER: @@ -327,13 +327,15 @@ enable_cmake-utils_src_configure() { fi fi - # Prepare Gentoo override rules (set valid compiler, append CPPFLAGS) + # Prepare Gentoo override rules (set valid compiler, append CPPFLAGS etc.) local build_rules=${CMAKE_BUILD_DIR}/gentoo_rules.cmake cat > "${build_rules}" <<- _EOF_ + SET (CMAKE_AR $(type -P $(tc-getAR)) CACHE FILEPATH "Archive manager" FORCE) SET (CMAKE_C_COMPILER $(type -P $(tc-getCC)) CACHE FILEPATH "C compiler" 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_COMPILER $(type -P $(tc-getCXX)) CACHE FILEPATH "C++ compiler" FORCE) SET (CMAKE_CXX_COMPILE_OBJECT "<CMAKE_CXX_COMPILER> <DEFINES> ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C++ compile command" FORCE) + SET (CMAKE_RANLIB $(type -P $(tc-getRANLIB)) CACHE FILEPATH "Archive index generator" FORCE) _EOF_ has "${EAPI:-0}" 0 1 2 && ! use prefix && EPREFIX= |