diff options
| author |   Michael Palimaka <kensington@gentoo.org> | 2013-04-07 17:21:11 +0000 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2013-04-07 17:21:11 +0000 |
| commit | 4bbdaa898da36558ee0a4ebb2319cf2ed1a93ad7 (patch) | |
| tree | ae879d7f50a7c9374dff5c98c5ff8ecc59af1a2d /eclass | |
| parent | Version bump, drop old. Use subslot dependency on libpng (diff) | |
| download | historical-4bbdaa898da36558ee0a4ebb2319cf2ed1a93ad7.tar.gz historical-4bbdaa898da36558ee0a4ebb2319cf2ed1a93ad7.tar.bz2 historical-4bbdaa898da36558ee0a4ebb2319cf2ed1a93ad7.zip | |
Guard against multiple inheritance. Improve cross-compilation support by always using the correct pkg-config.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 6 | ||||
| -rw-r--r-- | eclass/cmake-utils.eclass | 8 |
2 files changed, 12 insertions, 2 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 97f16113211d..00260f55aa85 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for eclass directory # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.770 2013/04/07 17:02:52 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.771 2013/04/07 17:21:11 kensington Exp $ + + 07 Apr 2013; Michael Palimaka <kensington@gentoo.org> cmake-utils.eclass: + Guard against multiple inheritance. Improve cross-compilation support by + always using the correct pkg-config. 07 Apr 2013; Michał Górny <mgorny@gentoo.org> python-any-r1.eclass, python-r1.eclass, python-single-r1.eclass, python-utils-r1.eclass: diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass index 360678cad03d..ddd0063b9c34 100644 --- a/eclass/cmake-utils.eclass +++ b/eclass/cmake-utils.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/cmake-utils.eclass,v 1.93 2013/02/08 13:43:19 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/cmake-utils.eclass,v 1.94 2013/04/07 17:21:11 kensington Exp $ # @ECLASS: cmake-utils.eclass # @MAINTAINER: @@ -18,6 +18,9 @@ # builds (default), in-source builds and an implementation of the well-known use_enable # and use_with functions for CMake. +if [[ ${___ECLASS_ONCE_CMAKE_UTILS} != "recur -_+^+_- spank" ]] ; then +___ECLASS_ONCE_CMAKE_UTILS="recur -_+^+_- spank" + # @ECLASS-VARIABLE: WANT_CMAKE # @DESCRIPTION: # Specify if cmake-utils eclass should depend on cmake optionaly or not. @@ -400,6 +403,7 @@ enable_cmake-utils_src_configure() { 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) + SET (PKG_CONFIG_EXECUTABLE $(type -P $(tc-getPKG_CONFIG)) CACHE FILEPATH "pkg-config executable" FORCE) _EOF_ has "${EAPI:-0}" 0 1 2 && ! use prefix && EPREFIX= @@ -621,3 +625,5 @@ _execute_optionaly() { use ${WANT_CMAKE} && enable_cmake-utils_${phase} "$@" fi } + +fi |