diff options
author | 2011-07-17 20:02:28 +0200 | |
---|---|---|
committer | 2011-07-17 20:03:54 +0200 | |
commit | 30e269432e9b1550f422b0bd18b328b995233548 (patch) | |
tree | 1327e77d6b9a0c45c05e2b8775e846db2381e259 /eclass | |
parent | Same magic for LAPACK (diff) | |
download | dilfridge-30e269432e9b1550f422b0bd18b328b995233548.tar.gz dilfridge-30e269432e9b1550f422b0bd18b328b995233548.tar.bz2 dilfridge-30e269432e9b1550f422b0bd18b328b995233548.zip |
Move module removal into configure phase (otherwise it might never be called), no src_prepare again
Diffstat (limited to 'eclass')
-rw-r--r-- | eclass/cmake-utils.eclass | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass index 20bbf82..4515db1 100644 --- a/eclass/cmake-utils.eclass +++ b/eclass/cmake-utils.eclass @@ -52,7 +52,7 @@ inherit toolchain-funcs multilib flag-o-matic base CMAKE_EXPF="src_compile src_test src_install" case ${EAPI:-0} in - 4|3|2) CMAKE_EXPF+=" src_prepare src_configure" ;; + 4|3|2) CMAKE_EXPF+=" src_configure" ;; 1|0) ;; *) die "Unknown EAPI, Bug eclass maintainers." ;; esac @@ -274,17 +274,13 @@ _modify-cmakelists() { _EOF_ } -enable_cmake-utils_src_prepare() { +enable_cmake-utils_src_configure() { debug-print-function ${FUNCNAME} "$@" local name for name in ${CMAKE_REMOVE_MODULES} ; do find "${S}" -name ${name}.cmake -exec rm -v {} + done -} - -enable_cmake-utils_src_configure() { - debug-print-function ${FUNCNAME} "$@" _check_build_dir @@ -387,7 +383,6 @@ enable_cmake-utils_src_configure() { enable_cmake-utils_src_compile() { debug-print-function ${FUNCNAME} "$@" - has src_prepare ${CMAKE_EXPF} || cmake-utils_src_prepare has src_configure ${CMAKE_EXPF} || cmake-utils_src_configure cmake-utils_src_make "$@" } @@ -441,14 +436,6 @@ enable_cmake-utils_src_test() { popd > /dev/null } -# @FUNCTION: cmake-utils_src_prepare -# @DESCRIPTION: -# General function for configuring with cmake. Default behaviour is to start an -# out-of-source build. -cmake-utils_src_prepare() { - _execute_optionaly "src_prepare" "$@" -} - # @FUNCTION: cmake-utils_src_configure # @DESCRIPTION: # General function for configuring with cmake. Default behaviour is to start an |