diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2010-01-10 22:17:02 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2010-01-10 22:17:02 +0000 |
| commit | 9a315bc2dca312533f726198c8c92715f52875a3 (patch) | |
| tree | 03ddd7983e34289191730a0921a97847e47c2820 /eclass | |
| parent | Add more build flags from old imake #299890 by Marcel Pennewiß. (diff) | |
| download | gentoo-2-9a315bc2dca312533f726198c8c92715f52875a3.tar.gz gentoo-2-9a315bc2dca312533f726198c8c92715f52875a3.tar.bz2 gentoo-2-9a315bc2dca312533f726198c8c92715f52875a3.zip | |
Fix not passing arguments. Per bug #300420. Thanks to Dennis Schridde (devurandom) for the patch.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/cmake-utils.eclass | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass index 2a7ccbb14c80..4e0f7391c8eb 100644 --- a/eclass/cmake-utils.eclass +++ b/eclass/cmake-utils.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/cmake-utils.eclass,v 1.41 2010/01/10 18:36:13 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/cmake-utils.eclass,v 1.42 2010/01/10 22:17:02 scarabeus Exp $ # @ECLASS: cmake-utils.eclass # @MAINTAINER: @@ -421,7 +421,7 @@ enable_cmake-utils_src_test() { # Wrapper for detection if we want to run enable_ prefixed function with same name # unconditionaly or only when some useflag is enabled. cmake-utils_src_configure() { - _execute_optionaly "src_configure" + _execute_optionaly "src_configure" "$@" } # @FUNCTION: cmake-utils_src_compile @@ -429,7 +429,7 @@ cmake-utils_src_configure() { # Wrapper for detection if we want to run enable_ prefixed function with same name # unconditionaly or only when some useflag is enabled. cmake-utils_src_compile() { - _execute_optionaly "src_compile" + _execute_optionaly "src_compile" "$@" } # @FUNCTION: cmake-utils_src_install @@ -437,7 +437,7 @@ cmake-utils_src_compile() { # Wrapper for detection if we want to run enable_ prefixed function with same name # unconditionaly or only when some useflag is enabled. cmake-utils_src_install() { - _execute_optionaly "src_install" + _execute_optionaly "src_install" "$@" } # @FUNCTION: cmake-utils_src_test @@ -445,15 +445,15 @@ cmake-utils_src_install() { # Wrapper for detection if we want to run enable_ prefixed function with same name # unconditionaly or only when some useflag is enabled. cmake-utils_src_test() { - _execute_optionaly "src_test" + _execute_optionaly "src_test" "$@" } _execute_optionaly() { - local phase="$1" + local phase="$1" ; shift if [[ ${WANT_CMAKE} = always ]]; then - enable_cmake-utils_${phase} + enable_cmake-utils_${phase} "$@" else - use ${WANT_CMAKE} && enable_cmake-utils_${phase} + use ${WANT_CMAKE} && enable_cmake-utils_${phase} "$@" fi } |