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 1QijoU-0002cj-CV for garchives@archives.gentoo.org; Mon, 18 Jul 2011 09:08:30 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5E0C021C103; Mon, 18 Jul 2011 09:08:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 2C9C121C103 for ; Mon, 18 Jul 2011 09:08:23 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9EF431B400C for ; Mon, 18 Jul 2011 09:08:22 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2276) id 5F7472004B; Mon, 18 Jul 2011 09:08:21 +0000 (UTC) From: "Andreas HAttel (dilfridge)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, dilfridge@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in eclass: cmake-utils.eclass X-VCS-Repository: gentoo-x86 X-VCS-Files: cmake-utils.eclass X-VCS-Directories: eclass X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas HAttel Content-Type: text/plain; charset=utf8 Message-Id: <20110718090821.5F7472004B@flycatcher.gentoo.org> Date: Mon, 18 Jul 2011 09:08:21 +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: 009436d7f3dcd622e2c526c1e45ac983 dilfridge 11/07/18 09:08:21 Modified: cmake-utils.eclass Log: Add CMAKE_REMOVE_MODULES feature to force use of patched system cmake m= odules where packages bring their own Revision Changes Path 1.70 eclass/cmake-utils.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/cmake-utils= .eclass?rev=3D1.70&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/cmake-utils= .eclass?rev=3D1.70&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/cmake-utils= .eclass?r1=3D1.69&r2=3D1.70 Index: cmake-utils.eclass =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/eclass/cmake-utils.eclass,v retrieving revision 1.69 retrieving revision 1.70 diff -u -r1.69 -r1.70 --- cmake-utils.eclass 27 Jun 2011 21:11:57 -0000 1.69 +++ cmake-utils.eclass 18 Jul 2011 09:08:21 -0000 1.70 @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/cmake-utils.eclass,v 1.69 2011= /06/27 21:11:57 abcd Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/cmake-utils.eclass,v 1.70 2011= /07/18 09:08:21 dilfridge Exp $ =20 # @ECLASS: cmake-utils.eclass # @MAINTAINER: @@ -33,6 +33,17 @@ # Specify the minimum required CMake version. Default is 2.8.1 CMAKE_MIN_VERSION=3D"${CMAKE_MIN_VERSION:-2.8.1}" =20 +# @ECLASS-VARIABLE: CMAKE_REMOVE_MODULES_LIST +# @DESCRIPTION: +# Space-separated list of CMake modules that will be removed in $S durin= g src_prepare,=20 +# in order to force packages to use the system version. +CMAKE_REMOVE_MODULES_LIST=3D"${CMAKE_REMOVE_MODULES_LIST:-FindBLAS FindL= APACK}" + +# @ECLASS-VARIABLE: CMAKE_REMOVE_MODULES +# @DESCRIPTION: +# Do we want to remove anything? yes or whatever else for no +CMAKE_REMOVE_MODULES=3D"${CMAKE_REMOVE_MODULES:-yes}" + CMAKEDEPEND=3D"" case ${WANT_CMAKE} in always) @@ -271,6 +282,13 @@ enable_cmake-utils_src_configure() { debug-print-function ${FUNCNAME} "$@" =20 + [[ "${CMAKE_REMOVE_MODULES}" =3D=3D "yes" ]] && { + local name + for name in ${CMAKE_REMOVE_MODULES_LIST} ; do + find "${S}" -name ${name}.cmake -exec rm -v {} + + done + } + _check_build_dir =20 # check if CMakeLists.txt exist and if no then die