Don't hardwire blas, but let cmake find it, bug 370721

Package-Manager: portage-2.1.10.1/cvs/Linux x86_64

4 files changed, 105 insertions, 15 deletions

diff --git a/sci-libs/clapack/ChangeLog b/sci-libs/clapack/ChangeLog
index 633519981763..0f4ef282a336 100644
--- a/sci-libs/clapack/ChangeLog
+++ b/sci-libs/clapack/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/clapack
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/clapack/ChangeLog,v 1.13 2011/05/09 23:11:47 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/clapack/ChangeLog,v 1.14 2011/06/17 21:16:09 dilfridge Exp $
+
+*clapack-3.2.1-r5 (17 Jun 2011)
+
+  17 Jun 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  +clapack-3.2.1-r5.ebuild, +files/clapack-3.2.1-findblas.patch:
+  Don't hardwire blas, but let cmake find it, bug 370721
 
   09 May 2011; Markos Chandras <hwoarang@gentoo.org> clapack-3.2.1-r4.ebuild:
   Stable on amd64 wrt bug #354033
diff --git a/sci-libs/clapack/Manifest b/sci-libs/clapack/Manifest
index 08392904ec1e..c1399d2b75f5 100644
--- a/sci-libs/clapack/Manifest
+++ b/sci-libs/clapack/Manifest
@@ -1,26 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
+AUX clapack-3.2.1-findblas.patch 1945 RMD160 97595331812bbdbc5c63c7697dd00ceb7137e9e7 SHA1 3aea0b50f353d47f999f591a26480f813ae5966b SHA256 c11045e539ff7c19e12e590cf1d55518b9c53250adb65d0bd5a77e7a9558bc50
 AUX clapack-3.2.1-fix_include_file.patch 689 RMD160 1140593aa3d24e749e86b2c15f01b59512287c02 SHA1 eec4b685ab1b09333e7d5cb5d2d1419815935b9f SHA256 9b6024cecbfb152d910b8fb878db6918704388479876719b43f4378992581603
 AUX clapack-3.2.1-noblasf2c.patch 5841 RMD160 50ca84aad167c389ddd5fe9c760daa5fce6a5082 SHA1 f14ced41155786b90ea8b98f9ab746dc81e8719e SHA256 37525a9099aba9130346abd2b765d05b7164c880a45b0b231b9bedfd63894fc2
 DIST clapack-3.2.1-CMAKE.tgz 6017667 RMD160 42af2b40a78b0cc4020a961a2fe0faf73c20560c SHA1 5ea1bcc4314e392bca8b9e5f61d44355cf9f4cc1 SHA256 0b3f782bc24845d85f36bafbff0f2f1384dc72df730fda4e7924ec1a70baca5a
 EBUILD clapack-3.2.1-r4.ebuild 755 RMD160 aa477556ddafb6818a8e96cac3e16b2102f6645c SHA1 cfea68d6adc9024d1a0652b54224dc51ce870188 SHA256 1ac568e45d6d2327ae34f0d577a8676092f39da2d146dcfd3983e8325f34f3c0
-MISC ChangeLog 2459 RMD160 60c6424b396d263a3e99eeb0dbdc48cc404e5a88 SHA1 f1398c10c183d81a4acac71b332bbe80905cde91 SHA256 963a4cb9e25e19a00d63b13c31b42e23cfe47c8b72ff69289244fed7f9967430
+EBUILD clapack-3.2.1-r5.ebuild 793 RMD160 c41716995a118b0b8b3bb4b1dc28e41b628b9631 SHA1 d911abb6e1105fbf30246a23077edf89228d73be SHA256 18a7a3f801d33d0142b7f55228995838e8b9c006d51cdd27ec0d753856f4ce08
+MISC ChangeLog 2673 RMD160 b31363912eb8b04928e179773e6ac0186e2e80b0 SHA1 567face132637d49e8059198a5ee81ed813bcddc SHA256 fa6cb293a3d790a8dd89adf1d81890da025c07c29594ea5bfabc328982161986
 MISC metadata.xml 581 RMD160 aa5fd2f24c925ba53410c2a6b2b9e357a79a5e22 SHA1 6d88ecc9bfaa1d1711cfb76d307b41b0ccd5f429 SHA256 c7fdad96aad5a3bbb64f5ea60fbacfa7cf51175b32a3c8c187df749a6206e393
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJNyHTFAAoJEPqDWhW0r/LCTg0P/2jqNIVLc3V2ByEckFwV97w+
-CBf7lecAapKT6x9s+YKHtBRIjD4rvdcrkG4ulsu8CP678O0dL4lYg6kfqtqw6FMZ
-pgIJiyiCTO1uDJleRYvhIODMOCfpgdGsiwW9SISK6gTRZNZ67EQtoOJY+vp4whPF
-t4H/Wa2aY/dkw+PS/QA7gD6/qZjsr81YTowHBMxYZQMF79XYPrV46FJy/3A4rr1j
-qrdJjbeAUh98lHKQbj3+d398GCQShUf+fjlXtmWHdVkduAbwnyHlkBlJPdGQBEYN
-eiTOLz+KabpJeOjc2vHZXpzMXyalYAe/TITn3wBw/HsYEpXEKgDxNpEh4ANC8YxI
-0vVWWMOsSRwwNhB7GnV85Pw+yOQ4HD5FkFx+2sB1EluBninP0PKTqoMarzX1xFte
-yk7dTV6Z/kGEsmGXo8gSckfEyD5PRLtlVWUUt7iQLW6C7cwWtZfWptIfRijo5Bm4
-5DZNd6GUnAwT5VWloJdYDahv7lUU73GQqA6+voqndR5Yzv7f0b/BvvOWIAO86VI6
-uYQwMYDaCyG0+11bnZWUbLfQlFgvk8FPVNyIvSy9BuCwjenGSv3TRZ7b/STJcTl/
-Gr8IiehA9c5krjMX2NjZK8UO8W05lRaDeXi5d0bZhcQrSKG4uoVLF8B7Y28KBHLu
-cRN+aTQnFLFW1wNkDobn
-=X3CN
+iQIcBAEBCgAGBQJN+8QgAAoJENwGBM22xffeW2QP/jl1f8VwG8C9E5Sg0CkjKR66
+66X0zNdppk6bklFtpalTd6s6a8UhHPC9fg2Xsogzov951BsSpJoJVt4DWYCoIHnx
+CWeD6ZRaxLtWDG/AHj24ZKo6QR/6RBYKFa71W1B4tcQVTz6EgYebmOi8k9Lz+DNn
+ChMy/SBzLAe8+U31wxXmq0CyoFxTyRopHe7qUhKYntkPNTSGDWYQFLi/FVaStm5c
+AU+7ry3SRMSmQs2OvjkRdhEIcP0jlTwFt0TYoNKrkD5P/iMO0LLsMrsPyq9R7Uup
+EVUuiWRt7qIpDy+QiOSksqFlCGXLDOCiUu+olD5RJDFMuMM8v3VQI19mN6HrOXWY
+JKYCwyaiieiCAk6/WTtsxifbxK2KHTRt4/1/mHM2wTlx6Ygb7orqBdQ8a2mVbjRP
+2lunq1BhrsNSjinPBvGhcVkXgp+rM1grCKS/S/UG0TReNCfMJsWzCfPm5s1+MFIP
+NHXmXOpbMiQvb+8pXLa2RZhD5E0hzfduzlR4L3cyGO4mVVMcXWR3/rI5tNcp0Jgm
+LusdZ1apJvmsiA4gDqy6cVxWnjsCBjJJpXL3qGUwiGp7yIw/unEluMkz+C+p5NJf
+Xp8PjiXPWIOL2HhKSvzrIv18CjIkjusqhNQ8rVUGPciAMgM6T3ppJRKX1ALkKA8V
+ocheUML12WmL0R3/tPXm
+=igNh
 -----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 000000000000..6fc2fbe09d5c
--- /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-r5.ebuild,v 1.1 2011/06/17 21:16:09 dilfridge Exp $
+
+EAPI=4
+
+inherit base cmake-utils
+
+DESCRIPTION="f2c'ed version of LAPACK"
+HOMEPAGE="http://www.netlib.org/clapack/"
+SRC_URI="http://www.netlib.org/${PN}/${P}-CMAKE.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="test"
+
+RDEPEND=">=dev-libs/libf2c-20090407-r1
+	virtual/blas"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${P}-CMAKE
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix_include_file.patch"
+	"${FILESDIR}/${P}-noblasf2c.patch"
+	"${FILESDIR}/${P}-findblas.patch"
+)
+
+src_configure() {
+	local mycmakeargs=( $(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-libs/clapack/files/clapack-3.2.1-findblas.patch
new file mode 100644
index 000000000000..e2744f8de567
--- /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/CMakeLists.txt
+--- clapack-3.2.1-CMAKE.orig/CMakeLists.txt	2011-06-17 23:01:05.275747599 +0200
++++ clapack-3.2.1-CMAKE/CMakeLists.txt	2011-06-17 23:07:49.128747755 +0200
+@@ -30,6 +30,28 @@
+ 
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
+ 
++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 ${BLAS_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)
+ 
+ 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-CMAKE/SRC/CMakeLists.txt
+--- clapack-3.2.1-CMAKE.orig/SRC/CMakeLists.txt	2011-06-17 23:01:05.276747599 +0200
++++ clapack-3.2.1-CMAKE/SRC/CMakeLists.txt	2011-06-17 23:08:43.761747789 +0200
+@@ -377,7 +377,7 @@
+ endif()
+ 
+ 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}")
+ 
+ install(