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 1QYOfI-0000Qh-LC for garchives@archives.gentoo.org; Sun, 19 Jun 2011 20:32:19 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3C27E1C049; Sun, 19 Jun 2011 20:32:08 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id D6E4E1C049 for ; Sun, 19 Jun 2011 20:32:07 +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 3F9DF1B4017 for ; Sun, 19 Jun 2011 20:32:07 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 990FA8003C for ; Sun, 19 Jun 2011 20:32:06 +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] 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-r6.ebuild sci-libs/clapack/files/clapack-3.2.1-findblas-r6.patch sci-libs/clapack/files/clapack-3.2.1-hang.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: b524a9f952b81e8cdee5f7de2b8ad65236f94241 Date: Sun, 19 Jun 2011 20:32:06 +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: 3330890f7a3ec15f6c37c7bd19f507ec commit: b524a9f952b81e8cdee5f7de2b8ad65236f94241 Author: Andreas K. Huettel (dilfridge) akhuettel de> AuthorDate: Sun Jun 19 20:31:47 2011 +0000 Commit: Andreas H=C3=BCttel gentoo org> CommitDate: Sun Jun 19 20:31:47 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Ddev/dilfridge.git;= a=3Dcommit;h=3Db524a9f9 Fix hang from KDE bug 274940; find blas with PkgConfig (Portage version: 2.1.10.3/git/Linux x86_64, signed Manifest commit with = key B6C5F7DE) --- sci-libs/clapack/ChangeLog | 7 +++ sci-libs/clapack/Manifest | 31 +++++++------ sci-libs/clapack/clapack-3.2.1-r6.ebuild | 34 +++++++++++++ .../clapack/files/clapack-3.2.1-findblas-r6.patch | 50 ++++++++++++++= ++++++ sci-libs/clapack/files/clapack-3.2.1-hang.patch | 15 ++++++ 5 files changed, 123 insertions(+), 14 deletions(-) diff --git a/sci-libs/clapack/ChangeLog b/sci-libs/clapack/ChangeLog index 8d63ba8..d5787b8 100644 --- a/sci-libs/clapack/ChangeLog +++ b/sci-libs/clapack/ChangeLog @@ -2,6 +2,13 @@ # 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-r6 (19 Jun 2011) + + 19 Jun 2011; Andreas K. Huettel + +clapack-3.2.1-r6.ebuild, +files/clapack-3.2.1-findblas-r6.patch, + +files/clapack-3.2.1-hang.patch: + Fix hang from KDE bug 274940; find blas with PkgConfig + *clapack-3.2.1-r5 (17 Jun 2011) =20 17 Jun 2011; Andreas K. Huettel diff --git a/sci-libs/clapack/Manifest b/sci-libs/clapack/Manifest index d1f8c72..ad3d246 100644 --- a/sci-libs/clapack/Manifest +++ b/sci-libs/clapack/Manifest @@ -2,8 +2,10 @@ Hash: SHA512 =20 AUX 3.2.1-solib.patch 844 RMD160 a756639bdf6acdb0f017de592efec8879876915= 5 SHA1 a04f2a910b633f2a5b4e9d1728670486ae8df504 SHA256 da2d1befec291f905c= 03bd6d73f74f361130ef22ad2629aa5edec8ee5e0d5b53 +AUX clapack-3.2.1-findblas-r6.patch 2001 RMD160 ae087273de037f12e96067c5= 4eca15027ac3c225 SHA1 5e1028c1f561d1cfaf43c5a34bf9bb5d23c90cf5 SHA256 1f9= c53147fd0e0ba3e0b391fc37a814d1d0b5cdd66327ab05b3f9746d54153e8 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-hang.patch 673 RMD160 60927477fba0840fd9b7fac205e600d9= 564c659b SHA1 6d09117be6b2e5e112efc320add1294455e9dec1 SHA256 41271247f5e= 513e571f3f4459f41ef9782366c60d1aee9097b66f9b075b054cb 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 DIST clapack-3.2.1-CMAKE.tgz 6017667 RMD160 42af2b40a78b0cc4020a961a2fe0= faf73c20560c SHA1 5ea1bcc4314e392bca8b9e5f61d44355cf9f4cc1 SHA256 0b3f782= bc24845d85f36bafbff0f2f1384dc72df730fda4e7924ec1a70baca5a @@ -12,22 +14,23 @@ EBUILD clapack-3.2.1-r2.ebuild 1544 RMD160 3e61910680= dbb57e316705330e796fd1ed456 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 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 +EBUILD clapack-3.2.1-r6.ebuild 836 RMD160 8c22bbcfa67588618fa7bfd54e0d08= 653f8cb3d8 SHA1 89befcb30147ad1d32019926ed9ac28cfe55a522 SHA256 746ac0730= 9ddab7594875f183f2d4f7f1a06290c98f1fc45c8574c08d725485d +MISC ChangeLog 2705 RMD160 a3c2aa3aaa7493e52e9bf0d3e25fc401d223eba1 SHA1= 2f40b50357fc34a2236b7dc7040a9be960dbbfaa SHA256 89e434e7aa1123faacb38777= c89fc835cff5301379ca27cf89368c19b54722d8 MISC metadata.xml 581 RMD160 aa5fd2f24c925ba53410c2a6b2b9e357a79a5e22 SH= A1 6d88ecc9bfaa1d1711cfb76d307b41b0ccd5f429 SHA256 c7fdad96aad5a3bbb64f5e= a60fbacfa7cf51175b32a3c8c187df749a6206e393 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) =20 -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 +iQIcBAEBCgAGBQJN/lyzAAoJENwGBM22xffep14P/iB1CZarU5De3X2ymiTl2z9h +2iqxwX5MHzquket+WgpXoRilXn3y5Ox6IA24DxIm0mdZhmkTGrMI6ePaoC4XB7W1 +sv6V5YzBzbgrmkjEnhgCocY9y0VWFieWgECSWp/Zy/ywnBA/hHy0CsGpy0PhrJ/c +4vP1mvIe7djO/YCevM2j03Qsqf30SrOAV2/CBFbYs17dYtCwEGRYet8eO2kLSmh3 +MasSAu8VrlDBJNh0k0AnFKF0V4Hdr1hpD9s6PcmU7A8U7AZtuoRqcTgEjHwyJezV +J3Mk65ROf9aCMKvzZ6IcBIGhD+U/HxWlBq/VWW7zREkI2+bE6bbNstnvWy7sqM/L +gY3Z5rMPHkzcOrch/PGMQlHOresTUyzhCa5ypFOccY31pju5yLdEkS65oBfdVJok +VVUF7Q+/X4kse58pCMC49BhXqCmFsGJo7n+ngcebPdJChrmgeFG49MKF2yy16kNp +q59rYFv6v0x090d2krvKzOiw6T06zIGOW4WfU6TMdefPkeaCzR6V/GqmSdyxEAG7 +FCIiZeIS9lrCrc96hXHoe91D4hUXcc8HZ7z/cGkh6YrnQOydLNgW5zfQmzwuPrVb +MTGNX5FNACBR9zi2Lh4duGSDmfOsrUWgmVSmlCOm80y5GFJgLzlTY2jdMspPejOf +86jAbPuJ43L3Ws50aQvq +=3D+Fq/ -----END PGP SIGNATURE----- diff --git a/sci-libs/clapack/clapack-3.2.1-r6.ebuild b/sci-libs/clapack/= clapack-3.2.1-r6.ebuild new file mode 100644 index 0000000..b3c03ea --- /dev/null +++ b/sci-libs/clapack/clapack-3.2.1-r6.ebuild @@ -0,0 +1,34 @@ +# 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}-hang.patch" + "${FILESDIR}/${P}-findblas-r6.patch" +) + +src_configure() { + local mycmakeargs=3D( $(cmake-utils_use_enable test TESTS) ) + VERBOSE=3D1 cmake-utils_src_configure +} diff --git a/sci-libs/clapack/files/clapack-3.2.1-findblas-r6.patch b/sci= -libs/clapack/files/clapack-3.2.1-findblas-r6.patch new file mode 100644 index 0000000..028dec6 --- /dev/null +++ b/sci-libs/clapack/files/clapack-3.2.1-findblas-r6.patch @@ -0,0 +1,50 @@ +diff -ruN clapack-3.2.1-CMAKE.1.allexfb/CMakeLists.txt clapack-3.2.1-CMA= KE/CMakeLists.txt +--- clapack-3.2.1-CMAKE.1.allexfb/CMakeLists.txt 2011-06-19 22:13:27.000= 000000 +0200 ++++ clapack-3.2.1-CMAKE/CMakeLists.txt 2011-06-19 22:23:14.000000000 +02= 00 +@@ -30,6 +30,29 @@ +=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(PkgConfig) ++ pkg_check_modules(BLAS 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 +67,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.1.allexfb/SRC/CMakeLists.txt clapack-3.2.1= -CMAKE/SRC/CMakeLists.txt +--- clapack-3.2.1-CMAKE.1.allexfb/SRC/CMakeLists.txt 2011-06-19 22:13:44= .000000000 +0200 ++++ clapack-3.2.1-CMAKE/SRC/CMakeLists.txt 2011-06-19 22:15:04.000000000= +0200 +@@ -380,7 +380,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( diff --git a/sci-libs/clapack/files/clapack-3.2.1-hang.patch b/sci-libs/c= lapack/files/clapack-3.2.1-hang.patch new file mode 100644 index 0000000..648516f --- /dev/null +++ b/sci-libs/clapack/files/clapack-3.2.1-hang.patch @@ -0,0 +1,15 @@ +Fix for https://bugs.kde.org/show_bug.cgi?id=3D274940 + +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 2009-08-10 19:47:54.0000= 00000 +0200 ++++ clapack-3.2.1-CMAKE/SRC/CMakeLists.txt 2011-06-19 02:17:34.119752822= +0200 +@@ -355,6 +355,9 @@ + zla_heamv.c zla_hercond_c.c zla_hercond_x.c zla_herpvgrw.c =09 + zla_lin_berr.c zlarscl2.c zlascl2.c zla_wwaddw.c) +=20 ++if(CMAKE_COMPILER_IS_GNUCXX) ++ set_source_files_properties(dlamch.c slamch.c PROPERTIES COMPILE_FLA= GS "-ffloat-store -O0") ++endif() +=20 + if( USEXBLAS) + set(ALLXOBJ ${SXLASRC} ${DXLASRC} ${CXLASRC} ${ZXLASRC} ${ALLXAUX})