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 1REJyW-000185-4G for garchives@archives.gentoo.org; Thu, 13 Oct 2011 12:01:24 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D3ABB21C052; Thu, 13 Oct 2011 12:01:16 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 9392821C052 for ; Thu, 13 Oct 2011 12:01:16 +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 D83D71B4013 for ; Thu, 13 Oct 2011 12:01:15 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id EAB5C80042 for ; Thu, 13 Oct 2011 12:01:14 +0000 (UTC) From: "Johannes Huber" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Johannes Huber" Message-ID: Subject: [gentoo-commits] proj/kde:master commit in: dev-util/cmake/files/, dev-util/cmake/ X-VCS-Repository: proj/kde X-VCS-Files: dev-util/cmake/cmake-2.8.6-r1.ebuild dev-util/cmake/cmake-2.8.6.ebuild dev-util/cmake/files/cmake-2.8.6-FindBLAS.patch dev-util/cmake/files/cmake-2.8.6-FindLAPACK.patch X-VCS-Directories: dev-util/cmake/files/ dev-util/cmake/ X-VCS-Committer: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: c6c6a59796a1f07f00a86c8f25a1e399377f5f53 Date: Thu, 13 Oct 2011 12:01:14 +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: f0c6fdc02c71e0332a0dd4a9c7a34cf0 commit: c6c6a59796a1f07f00a86c8f25a1e399377f5f53 Author: Johannes Huber gmx de> AuthorDate: Thu Oct 13 11:47:50 2011 +0000 Commit: Johannes Huber gmx de> CommitDate: Thu Oct 13 11:47:50 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/kde.git;a=3Dc= ommit;h=3Dc6c6a597 [dev-util/cmake] Added patches thx Arseny Solokha, bug 386919 --- .../{cmake-2.8.6.ebuild =3D> cmake-2.8.6-r1.ebuild} | 2 + dev-util/cmake/files/cmake-2.8.6-FindBLAS.patch | 34 ++++++++++++++= ++++++ dev-util/cmake/files/cmake-2.8.6-FindLAPACK.patch | 34 ++++++++++++++= ++++++ 3 files changed, 70 insertions(+), 0 deletions(-) diff --git a/dev-util/cmake/cmake-2.8.6.ebuild b/dev-util/cmake/cmake-2.8= .6-r1.ebuild similarity index 98% rename from dev-util/cmake/cmake-2.8.6.ebuild rename to dev-util/cmake/cmake-2.8.6-r1.ebuild index b5f6966..9431cba 100644 --- a/dev-util/cmake/cmake-2.8.6.ebuild +++ b/dev-util/cmake/cmake-2.8.6-r1.ebuild @@ -56,6 +56,8 @@ PATCHES=3D( "${FILESDIR}"/${PN}-2.8.3-more-no_host_paths.patch "${FILESDIR}"/${PN}-2.8.3-ruby_libname.patch "${FILESDIR}"/${PN}-2.8.4-FindBoost.patch + "${FILESDIR}"/${PN}-2.8.6-FindBLAS.patch + "${FILESDIR}"/${PN}-2.8.6-FindLAPACK.patch ) cmake_src_bootstrap() { # Cleanup args to extract only JOBS. diff --git a/dev-util/cmake/files/cmake-2.8.6-FindBLAS.patch b/dev-util/c= make/files/cmake-2.8.6-FindBLAS.patch new file mode 100644 index 0000000..75b2814 --- /dev/null +++ b/dev-util/cmake/files/cmake-2.8.6-FindBLAS.patch @@ -0,0 +1,34 @@ +--- cmake-2.8.6.orig/Modules/FindBLAS.cmake 2011-10-09 23:32:55.09635697= 3 +0800 ++++ cmake-2.8.6/Modules/FindBLAS.cmake 2011-10-09 23:35:10.235667390 +08= 00 +@@ -1,3 +1,9 @@ ++# ++# Version modified for Gentoo Linux ++# If a valid PkgConfig configuration for blas is found, this overrides = and cancels ++# all further checks. ++# ++ + # - Find BLAS library + # This module finds an installed fortran library that implements the BL= AS + # linear-algebra interface (see http://www.netlib.org/blas/). +@@ -39,6 +45,14 @@ + # (To distribute this file outside of CMake, substitute the full + # License text for the above reference.) +=20 ++# ++# first, try PkgConfig ++# ++find_package(PkgConfig REQUIRED) ++pkg_check_modules(BLAS blas) ++if(NOT BLAS_FOUND) ++message(STATUS "No PkgConfig configuration for BLAS found; starting mor= e extensive search.") ++ + include(CheckFunctionExists) + include(CheckFortranFunctionExists) +=20 +@@ -621,4 +635,6 @@ + endif(NOT BLAS_FIND_QUIETLY) + endif(BLA_F95) +=20 ++endif(NOT BLAS_FOUND) ++ + set(CMAKE_FIND_LIBRARY_SUFFIXES ${_blas_ORIG_CMAKE_FIND_LIBRARY_SUFFIXE= S}) diff --git a/dev-util/cmake/files/cmake-2.8.6-FindLAPACK.patch b/dev-util= /cmake/files/cmake-2.8.6-FindLAPACK.patch new file mode 100644 index 0000000..d1f3a96 --- /dev/null +++ b/dev-util/cmake/files/cmake-2.8.6-FindLAPACK.patch @@ -0,0 +1,34 @@ +--- cmake-2.8.6.orig/Modules/FindLAPACK.cmake 2011-10-09 23:38:48.956933= 106 +0800 ++++ cmake-2.8.6/Modules/FindLAPACK.cmake 2011-10-09 23:39:52.002144646 += 0800 +@@ -1,3 +1,9 @@ ++# ++# Version modified for Gentoo Linux ++# If a valid PkgConfig configuration is found, this overrides and cance= ls ++# all further checks. ++# ++ + # - Find LAPACK library + # This module finds an installed fortran library that implements the LA= PACK + # linear-algebra interface (see http://www.netlib.org/lapack/). +@@ -36,6 +42,14 @@ + # (To distribute this file outside of CMake, substitute the full + # License text for the above reference.) +=20 ++# ++# first, try PkgConfig ++# ++find_package(PkgConfig REQUIRED) ++pkg_check_modules(LAPACK lapack) ++if(NOT LAPACK_FOUND) ++message(STATUS "No PkgConfig configuration for LAPACK found; starting m= ore extensive search.") ++ + set(_lapack_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFI= XES}) +=20 + get_property(_LANGUAGES_ GLOBAL PROPERTY ENABLED_LANGUAGES) +@@ -304,4 +318,6 @@ + endif(NOT LAPACK_FIND_QUIETLY) + endif(BLA_F95) +=20 ++endif(NOT LAPACK_FOUND) ++ + set(CMAKE_FIND_LIBRARY_SUFFIXES ${_lapack_ORIG_CMAKE_FIND_LIBRARY_SUFFI= XES})