From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QiVgF-0003Lp-Nf for garchives@archives.gentoo.org; Sun, 17 Jul 2011 18:03:06 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EF5F121C1E1; Sun, 17 Jul 2011 18:02:55 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id C1F7B21C1D2 for ; Sun, 17 Jul 2011 18:02:55 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 49E5C1B4006 for ; Sun, 17 Jul 2011 18:02:55 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 5BF7F8003D for ; Sun, 17 Jul 2011 18:02:54 +0000 (UTC) From: "Andreas Hüttel" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Hüttel" Message-ID: Subject: [gentoo-commits] proj/sci:master commit in: eclass/ X-VCS-Repository: proj/sci X-VCS-Files: eclass/cmake-utils.eclass X-VCS-Directories: eclass/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas Hüttel X-VCS-Revision: bd658e9f049ad78b19e0c7ee87904f18493eed4f Date: Sun, 17 Jul 2011 18:02:54 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: fca61936c4bb2f3fe928727b706c8a27 commit: bd658e9f049ad78b19e0c7ee87904f18493eed4f Author: Andreas K. Huettel (dilfridge) gentoo o= rg> AuthorDate: Sun Jul 17 18:02:28 2011 +0000 Commit: Andreas H=C3=BCttel gentoo org> CommitDate: Sun Jul 17 18:02:28 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/sci.git;a=3Dc= ommit;h=3Dbd658e9f Move module removal into configure phase (otherwise it might never be cal= led), no src_prepare again --- 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 =20 CMAKE_EXPF=3D"src_compile src_test src_install" case ${EAPI:-0} in - 4|3|2) CMAKE_EXPF+=3D" src_prepare src_configure" ;; + 4|3|2) CMAKE_EXPF+=3D" src_configure" ;; 1|0) ;; *) die "Unknown EAPI, Bug eclass maintainers." ;; esac @@ -274,17 +274,13 @@ _modify-cmakelists() { _EOF_ } =20 -enable_cmake-utils_src_prepare() { +enable_cmake-utils_src_configure() { debug-print-function ${FUNCNAME} "$@" =20 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} "$@" =20 _check_build_dir =20 @@ -387,7 +383,6 @@ enable_cmake-utils_src_configure() { enable_cmake-utils_src_compile() { debug-print-function ${FUNCNAME} "$@" =20 - 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 } =20 -# @FUNCTION: cmake-utils_src_prepare -# @DESCRIPTION: -# General function for configuring with cmake. Default behaviour is to s= tart 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 s= tart an