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 1QXgN9-0005nk-9P for garchives@archives.gentoo.org; Fri, 17 Jun 2011 21:14:35 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 02AEE1C06F; Fri, 17 Jun 2011 21:14:26 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id B2CA11C06F for ; Fri, 17 Jun 2011 21:14:26 +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 097891BC017 for ; Fri, 17 Jun 2011 21:14:26 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 64A138003C for ; Fri, 17 Jun 2011 21:14:25 +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: <1337c871c4e108587e2debf062fd83409028ad5e.dilfridge@gentoo> Subject: [gentoo-commits] dev/dilfridge:master commit in: sci-libs/clapack/, sci-libs/clapack/files/ X-VCS-Repository: dev/dilfridge X-VCS-Files: sci-libs/clapack/ChangeLog sci-libs/clapack/Manifest sci-libs/clapack/clapack-3.2.1-r5.ebuild sci-libs/clapack/files/clapack-3.2.1-findblas.patch X-VCS-Directories: sci-libs/clapack/ sci-libs/clapack/files/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas Hüttel X-VCS-Revision: 1337c871c4e108587e2debf062fd83409028ad5e Date: Fri, 17 Jun 2011 21:14:25 +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: e130bf39a4360acc5dcce40b2e940401 commit: 1337c871c4e108587e2debf062fd83409028ad5e Author: Andreas K. Huettel (dilfridge) akhuettel de> AuthorDate: Fri Jun 17 21:14:17 2011 +0000 Commit: Andreas H=C3=BCttel gentoo org> CommitDate: Fri Jun 17 21:14:17 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Ddev/dilfridge.git;= a=3Dcommit;h=3D1337c871 [sci-libs/clapack] Make eselect blas work here (Portage version: 2.1.10.1/git/Linux x86_64, signed Manifest commit with = key B6C5F7DE) --- sci-libs/clapack/ChangeLog | 6 ++ sci-libs/clapack/Manifest | 30 ++++++------ sci-libs/clapack/clapack-3.2.1-r5.ebuild | 33 +++++++++++++ .../clapack/files/clapack-3.2.1-findblas.patch | 49 ++++++++++++++= ++++++ 4 files changed, 104 insertions(+), 14 deletions(-) diff --git a/sci-libs/clapack/ChangeLog b/sci-libs/clapack/ChangeLog index 6c15890..8d63ba8 100644 --- a/sci-libs/clapack/ChangeLog +++ b/sci-libs/clapack/ChangeLog @@ -2,6 +2,12 @@ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/sci-libs/clapack/ChangeLog,v 1.9 2010= /09/18 22:44:41 dilfridge Exp $ =20 +*clapack-3.2.1-r5 (17 Jun 2011) + + 17 Jun 2011; Andreas K. Huettel + +clapack-3.2.1-r5.ebuild, +files/clapack-3.2.1-findblas.patch: + Make eselect blas work here + 11 May 2011; Andreas K. Huettel clapack-3.2.1-r4.ebuild: Resync with tree diff --git a/sci-libs/clapack/Manifest b/sci-libs/clapack/Manifest index 9be54bd..d1f8c72 100644 --- a/sci-libs/clapack/Manifest +++ b/sci-libs/clapack/Manifest @@ -2,6 +2,7 @@ Hash: SHA512 =20 AUX 3.2.1-solib.patch 844 RMD160 a756639bdf6acdb0f017de592efec8879876915= 5 SHA1 a04f2a910b633f2a5b4e9d1728670486ae8df504 SHA256 da2d1befec291f905c= 03bd6d73f74f361130ef22ad2629aa5edec8ee5e0d5b53 +AUX clapack-3.2.1-findblas.patch 1945 RMD160 97595331812bbdbc5c63c7697dd= 00ceb7137e9e7 SHA1 3aea0b50f353d47f999f591a26480f813ae5966b SHA256 c11045= e539ff7c19e12e590cf1d55518b9c53250adb65d0bd5a77e7a9558bc50 AUX clapack-3.2.1-fix_include_file.patch 689 RMD160 1140593aa3d24e749e86= b2c15f01b59512287c02 SHA1 eec4b685ab1b09333e7d5cb5d2d1419815935b9f SHA256= 9b6024cecbfb152d910b8fb878db6918704388479876719b43f4378992581603 AUX clapack-3.2.1-noblasf2c-r4.patch 5852 RMD160 7dea18e7fd5bf378ba9f649= 5e457c931b8ee7bd6 SHA1 1bbc3178c09832d4654d8d854a4156bf61c81112 SHA256 39= c6ed8e878b0fe74c1eba9745d60ea35611596b4ab68191e42fe3dc0f7a14a3 AUX clapack-3.2.1-noblasf2c.patch 5841 RMD160 50ca84aad167c389ddd5fe9c76= 0daa5fce6a5082 SHA1 f14ced41155786b90ea8b98f9ab746dc81e8719e SHA256 37525= a9099aba9130346abd2b765d05b7164c880a45b0b231b9bedfd63894fc2 @@ -10,22 +11,23 @@ DIST clapack-3.2.1.tgz 7221385 RMD160 5882b199595ae0c= e6769cd65cb83cfeb7dcac528 S EBUILD clapack-3.2.1-r2.ebuild 1544 RMD160 3e61910680dbb57e316705330e796= fd1ed456073 SHA1 6117683296ea4136f240930e423d29b0be096ab1 SHA256 8e41637b= efd64a4678e37261de995efe357121b91686a0378c10c1f45a3ac73f EBUILD clapack-3.2.1-r3.ebuild 770 RMD160 72d2e792b30db7b8820095d88f9f8f= 6aa776393f SHA1 269f169309a273228d948fc10e20400616e5e326 SHA256 667d88d56= 748e8c7635e37ed8c2f4e3feba2ae25f2921a61cd9599ae098de265 EBUILD clapack-3.2.1-r4.ebuild 755 RMD160 aa477556ddafb6818a8e96cac3e16b= 2102f6645c SHA1 cfea68d6adc9024d1a0652b54224dc51ce870188 SHA256 1ac568e45= d6d2327ae34f0d577a8676092f39da2d146dcfd3983e8325f34f3c0 -MISC ChangeLog 2268 RMD160 dc88265cd3f875d43101e0164fc6dda5fa12adb1 SHA1= 4ba94085a91eddee825a6e3b681913c4c5421b88 SHA256 926b34a3e8e0e4425fedb0f0= 42c96e6de0f597d45b035353ee77cf09844c3863 +EBUILD clapack-3.2.1-r5.ebuild 792 RMD160 dc6fbe4a87dffc3b6cc1083f2153f9= 5f613de52a SHA1 2cf698bbf7a9e83d65da0d6834b39436d0425838 SHA256 bdf016d23= e341ffe5b9631071c8006c5c8022c05a4eef0ced7d3a9c46f9a12d1 +MISC ChangeLog 2454 RMD160 9da15fc858e72c7ac0608fe76c6cff20664434d1 SHA1= 6ad9700b14fa0733f692ce7cc2c846327591611f SHA256 818ba6712d7a0ce33b5d37f7= 092077734952e553ea5cf51cc87718052ea9c0a5 MISC metadata.xml 581 RMD160 aa5fd2f24c925ba53410c2a6b2b9e357a79a5e22 SH= A1 6d88ecc9bfaa1d1711cfb76d307b41b0ccd5f429 SHA256 c7fdad96aad5a3bbb64f5e= a60fbacfa7cf51175b32a3c8c187df749a6206e393 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) =20 -iQIcBAEBCgAGBQJNyvjeAAoJENwGBM22xffepQEQAIPY5WWpHhjZmg05Q79+2FYZ -gXjHGCmryOLh8q1S5S9SC3f53yMChPeBL4gNd+uM3/zvh4699xl3aLRlWb0tugBk -OACNGfZmdWwLsowu6/etkAaqqmeU0W9OoeD3HOFHmTeuPojywzMsYNFIvC2DS9tI -c0J4y8vW60F6dul4/1WwFDPDF0fM3/hylmDcUsvqIBdNELKOPRWUGxg9sFRYMko3 -B+s22mZX2432jjz02oorJnR2JFAX/sBblQjfvcSVqfMYQg2OUtNkciTPKpIThhsB -Nc+PdVXJOTDpeGXXWe7Jdin4rMigxpLmQnBffJyMWnKP/FVHIjGiIgBXFbp+Hn2D -D888BocxOh26t+Kga2hLLf4LUima/TDd+R3c4eiBq7P7tBlmz43M0+2C0EkcL+c9 -pMqmwHy5YPKRlpK4IqXd1DzA1XMaZiDfhNOwyj1j0vxj78fvFt9QxKTeiSzJIjFd -USGJctfY6SpjajjMNK5oyhLOibnCWKi5RNlmPihmEn8CUpsgdsA9Yq0mbCrpB+QB -d/uIMx7oG9WEbFY83b7QCkRInbmzObU3WARd/2VnnDA1XR6KWvhLzH4B4pjNSS9Y -CKY7gAqh9yoXWBHlOH9X4i0F2KxmtYd7vop2j4+FG0MNipEB2741GGdfa3xuKB1H -YZVxpSekeoznoV7qH0d3 -=3DoE7n +iQIcBAEBCgAGBQJN+8OpAAoJENwGBM22xffetdUP/0z2AtjP9deRgZqLu8ROeFsH +PGMtWt7yXugYpYtoTxWDZ6PEpl1V4WVPQZCQxLN/LfRItF8U6qqTHkxxtSQ3lebu +Id1Q3YHFBpG/CBGEYpqcmVJBgxDiy/l/yPacABz7bsiFGt6b11yn7WnFyLhPCSYE +0HwkbPLDi+lo0axPtEw0KmOt2CdCeWmRXiapsFmWBrPfU6edqt4TFLyiLuIKE1E8 +bgQJT9V+kUK8N+KNbUn7vUaR5pa6BkGlOj7VNpRgqHHg8VbnLbrrtA1MXi6kO0MX +TgI3w2nao+wFzf9bI8F//ZtChmCRTBr9Ln9sYxDW3/eRxe0zkQVx0YYWiVaU48+Y +lvkk0o7CLqg1bhFyukPXzurFS8ScKSiBeVH/Uemc7fzHrJwtBNl3i5o/xPJcDPcI +kMh0qYNnS4iaeBdViniSw6JW0Ia6XFSp5yAfQtf55R9QvU2EMEm/j6XAd7mGsbZu +WnPtRb8ClS6Rlg0s4D+PVVP+PpMAC9VCNQko92TrMRpzEgH9aewM9vuG8b8nNbSk +/Zjyd45405XPepH8W5n2knJyqDc2ZOC1pr4oZULCBx5J/YgBxOqO5r5AP7FCB9Kf +OE+LD64fk+Kwh3Ob3BNtj4FNv8IuekOEP7iddm3ZrhZ3KFIisAh47Tyg/WAkcciD +OHOsX/6TiwLCoL701IZw +=3DioBT -----END PGP SIGNATURE----- diff --git a/sci-libs/clapack/clapack-3.2.1-r5.ebuild b/sci-libs/clapack/= clapack-3.2.1-r5.ebuild new file mode 100644 index 0000000..521465f --- /dev/null +++ b/sci-libs/clapack/clapack-3.2.1-r5.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sci-libs/clapack/clapack-3.2.1-r4.ebu= ild,v 1.3 2011/05/09 23:11:47 hwoarang Exp $ + +EAPI=3D4 + +inherit base cmake-utils + +DESCRIPTION=3D"f2c'ed version of LAPACK" +HOMEPAGE=3D"http://www.netlib.org/clapack/" +SRC_URI=3D"http://www.netlib.org/${PN}/${P}-CMAKE.tgz" + +LICENSE=3D"BSD" +SLOT=3D"0" +KEYWORDS=3D"~amd64 ~ppc ~x86" +IUSE=3D"test" + +RDEPEND=3D">=3Ddev-libs/libf2c-20090407-r1 + virtual/blas" +DEPEND=3D"${RDEPEND}" + +S=3D${WORKDIR}/${P}-CMAKE + +PATCHES=3D( + "${FILESDIR}/${P}-fix_include_file.patch" + "${FILESDIR}/${P}-noblasf2c.patch" + "${FILESDIR}/${P}-findblas.patch" +) + +src_configure() { + local mycmakeargs=3D( $(cmake-utils_use_enable test TESTS) ) + cmake-utils_src_configure +} diff --git a/sci-libs/clapack/files/clapack-3.2.1-findblas.patch b/sci-li= bs/clapack/files/clapack-3.2.1-findblas.patch new file mode 100644 index 0000000..e2744f8 --- /dev/null +++ b/sci-libs/clapack/files/clapack-3.2.1-findblas.patch @@ -0,0 +1,49 @@ +diff -ruN clapack-3.2.1-CMAKE.orig/CMakeLists.txt clapack-3.2.1-CMAKE/CM= akeLists.txt +--- clapack-3.2.1-CMAKE.orig/CMakeLists.txt 2011-06-17 23:01:05.27574759= 9 +0200 ++++ clapack-3.2.1-CMAKE/CMakeLists.txt 2011-06-17 23:07:49.128747755 +02= 00 +@@ -30,6 +30,28 @@ +=20 + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC") +=20 ++if(BLAS_LIBRARIES) ++ include(CheckFortranFunctionExists) ++ set(CMAKE_REQUIRED_LIBRARIES ${BLAS_LIBRARIES}) ++ CHECK_FORTRAN_FUNCTION_EXISTS("dgemm" BLAS_FOUND) ++ unset( CMAKE_REQUIRED_LIBRARIES ) ++ if(BLAS_FOUND) ++ message(STATUS "--> BLAS supplied by user is WORKING, will use ${BL= AS_LIBRARIES}.") ++ else(BLAS_FOUND) ++ message(ERROR "--> BLAS supplied by user is not WORKING, CANNOT USE= ${BLAS_LIBRARIES}.") ++ message(ERROR "--> Will use REFERENCE BLAS (by default)") ++ message(ERROR "--> Or Correct your BLAS_LIBRARIES entry ") ++ message(ERROR "--> Or Consider checking USE_OPTIMIZED_BLAS") ++ endif(BLAS_FOUND) ++else(BLAS_LIBRARIES) ++ # User did not provide a BLAS Library ++ find_package( BLAS ) ++endif (BLAS_LIBRARIES) ++ ++if(NOT BLAS_FOUND) ++ message(FATAL_ERROR "--> BLAS libraries needed but not found.") ++endif(NOT BLAS_FOUND) ++ + add_subdirectory(SRC) +=20 + if(ENABLE_TESTS) +@@ -44,4 +66,3 @@ + ${CLAPACK_BINARY_DIR}/clapack-config-version.cmake @ONLY) + configure_file(${CLAPACK_SOURCE_DIR}/clapack-config.cmake.in + ${CLAPACK_BINARY_DIR}/clapack-config.cmake @ONLY) +- +diff -ruN clapack-3.2.1-CMAKE.orig/SRC/CMakeLists.txt clapack-3.2.1-CMAK= E/SRC/CMakeLists.txt +--- clapack-3.2.1-CMAKE.orig/SRC/CMakeLists.txt 2011-06-17 23:01:05.2767= 47599 +0200 ++++ clapack-3.2.1-CMAKE/SRC/CMakeLists.txt 2011-06-17 23:08:43.761747789= +0200 +@@ -377,7 +377,7 @@ + endif() +=20 + add_library(clapack SHARED ${ALLOBJ} ${ALLXOBJ}) +-target_link_libraries(clapack blas f2c m) ++target_link_libraries(clapack ${BLAS_LIBRARIES} f2c m) + set_target_properties(clapack PROPERTIES SOVERSION "${CLAPACK_VERSION}"= ) +=20 + install(