sci-libs/clapack: Add libdir path to linker flags, #446930; don't build testsuite with fPIC

Package-Manager: portage-2.2.0_alpha148/cvs/Linux x86_64
Manifest-Sign-Key: 0x70EB7916

5 files changed, 138 insertions, 8 deletions

diff --git a/sci-libs/clapack/ChangeLog b/sci-libs/clapack/ChangeLog
index 867d565507b5..16a0525d742f 100644
--- a/sci-libs/clapack/ChangeLog
+++ b/sci-libs/clapack/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/clapack
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/clapack/ChangeLog,v 1.21 2012/08/03 17:19:41 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/clapack/ChangeLog,v 1.22 2012/12/12 16:26:56 jlec Exp $
+
+*clapack-3.2.1-r7 (12 Dec 2012)
+
+  12 Dec 2012; Justin Lecher <jlec@gentoo.org> +clapack-3.2.1-r7.ebuild,
+  +files/clapack-3.2.1-findblas-r7.patch, metadata.xml:
+  Add libdir path to linker flags, #446930; don't build testsuite with fPIC
 
   03 Aug 2012; Sébastien Fabbro <bicatali@gentoo.org> clapack-3.2.1-r6.ebuild:
   keyword x86-linux
diff --git a/sci-libs/clapack/Manifest b/sci-libs/clapack/Manifest
index dfc88666aa19..c65e435ca52b 100644
--- a/sci-libs/clapack/Manifest
+++ b/sci-libs/clapack/Manifest
@@ -2,18 +2,20 @@
 Hash: SHA256
 
 AUX clapack-3.2.1-findblas-r6.patch 2001 SHA256 1f9c53147fd0e0ba3e0b391fc37a814d1d0b5cdd66327ab05b3f9746d54153e8 SHA512 71e7ee27999228886d605020ba6fb223a7cf99bcf34d7d2bc859ea632ce9837e2755159efbc1a339397d0e544064b187563b47bb340e1d9f7d8a8b95c390180c WHIRLPOOL 1c7405d34d72df6d851e352d4466ab5152237a1ebfe0dc6c32f8a7a85cd07d206eb0f9095f03ff45bacd049e40542305124d9d5cbd0a0e6dd2c1c2c8b61ba14a
+AUX clapack-3.2.1-findblas-r7.patch 3163 SHA256 fd01b1709b1beb97fc69332b0ced2a703c30f4ba92fbad7d5666bb1eebb91437 SHA512 84010f10a0d7932597638018ee607414ff5420ba168dc7b3200caeecaf3afdf3e17af9fdee558ce919c67d66c2c795a290fd0d882bfcc53a2e9f7afec0879c57 WHIRLPOOL b07c35288de19653df7e5df20facde32b1093966ec4a3abf2415ed82c303b25e2e796be4d8c9ccbc5818b3ef4b802df82d9a0d915b8a5f264e6dbfbe5bb94e71
 AUX clapack-3.2.1-findblas.patch 1945 SHA256 c11045e539ff7c19e12e590cf1d55518b9c53250adb65d0bd5a77e7a9558bc50 SHA512 9fab257f24ec642636e6bff434b5dab9f8c2e9bbe55a5c6675fee3d179fb5dc3c09bd4329a4e30dac52237a49522175b86612f81cc2a8abf961e6c08016f9740 WHIRLPOOL d0c07c19b24e3525284f633ae313be435fefc92686f2292788da73789b42670329777d7bd8830209130806ce994f32d0d48a646b7b38148d1b358c1789fcf341
 AUX clapack-3.2.1-fix_include_file.patch 689 SHA256 9b6024cecbfb152d910b8fb878db6918704388479876719b43f4378992581603 SHA512 74bddac93db98e2752eb7064578e246e113bc850fe8671ecd129f05490345130ded6c5188eb07cc6a086b8044959a4595ee46912af30ee39b9f80244d7b8335b WHIRLPOOL 99732f878d800cacaa819fe211a6109b4a4426971dae808357fc7425d92ad6144f160c4ff897be66504e891295fb7aebc9fcc7036930f22eda3549eca951ce92
 AUX clapack-3.2.1-hang.patch 641 SHA256 19322ccb00dea5abdd28aaad5c25ad58c4a6bb8b5ad15e9dad329fa6c113f9a8 SHA512 a6e7461bfe7bddd2120c46e3629a899cc12c23669b22b562675922bf11d2fb69793e8093d24773d688e0d7e1f24c08b16ccd2b01631b23f55fbb7a10c29ed036 WHIRLPOOL 066c25f92ef6354c113f3ccc46f50fc884c323d718e5db50a68fa7981e1e7e5366f1ca847901f3fb7c9e73d1a5ebe061c4342d2819ed9d06cefd3c0df2818599
 AUX clapack-3.2.1-noblasf2c.patch 5841 SHA256 37525a9099aba9130346abd2b765d05b7164c880a45b0b231b9bedfd63894fc2 SHA512 68571f682e7015c75104494f8d156cd0c1f758aa03d9c2614f93db418c8d4f9c9c2e7b5d965022060f776a9baa8d48c15bbfa30dbcada03bccffa4ebb3c4deef WHIRLPOOL 695a06b64ba1fcd76b78693d9992ef1e7209fce8355e81c81a354a2f041e1198e1693b3246b98512a2e725b18fa7aa6b21466605792b56c68d56e77c63d6d444
 DIST clapack-3.2.1-CMAKE.tgz 6017667 SHA256 0b3f782bc24845d85f36bafbff0f2f1384dc72df730fda4e7924ec1a70baca5a SHA512 cf19c710291ddff3f6ead7d86bdfdeaebca21291d9df094bf0a8ef599546b007757fb2dbb19b56511bb53ef7456eac0c73973b9627bf4d02982c856124428b49 WHIRLPOOL 9b2e5ba8a2503542c480565e4c34510b9fd501677c30e34b19ede18092ae40b282e4261f1939b5681c82f82d448d4afa24123ce8fb15120c7446e91ea51a698e
 EBUILD clapack-3.2.1-r6.ebuild 945 SHA256 a9f76108dffd84a7831d2e4d18c5fb201dc2568ce0ad04f7d71c2384ca56d499 SHA512 6c76ea216510bc4100446842a0d3874d78651945349a0b6db0748a43080b6824f0dff0c304b667daf13db0eb4205882b874f58ce193e7ade31867d4e3dc64dd5 WHIRLPOOL 2abd19aacb567462483a4f59405518c9552292ea77b9150fafd05824e0a5bc449ed5159c608df99476e2925037a900e7fc3c195bf707b2cd869d9e2daa3b41e6
-MISC ChangeLog 3728 SHA256 b4c2982d95a6a7f2df62cc659d16ca581b952801f80b04fb28ee0835ead4e82d SHA512 501805995883ebf9881c11fb62f3e65e59d54ecb7b31a95bca8110af92441f25d00777c6624e3cb6602b1616a79b2e7eef03a722b8b766f4412a213ee3369831 WHIRLPOOL 8ab873ba175a15572336216259c02394c2629ee391ba7a7994513a8b42ad9e23b59161c32406d97d329be94947166f10ba400d9dbcc9a054069d6363f8a0ee4a
-MISC metadata.xml 581 SHA256 c7fdad96aad5a3bbb64f5ea60fbacfa7cf51175b32a3c8c187df749a6206e393 SHA512 b100f88d9e4bd9da4dcdefc9f8dacf96b985bc9bf25366d0e658bccca9cfaad1c8a253e43152e55d497a00bc1c5ce2034beaf881be7eacc0c20100108427f6f0 WHIRLPOOL cfc2cface3c594ec8f43de961cf27222764d2d9b6cb170349e7a51c722def62d51ab5f24e894f5474783cb312af958959345f68a9afacef34ddf24ad16f9f22c
+EBUILD clapack-3.2.1-r7.ebuild 943 SHA256 6a3ad3687321cf6370669ade83e39f0363e30506edde8e98a1721e025aafb7e7 SHA512 b4002bc9713f6d87ded0387c82ea545b85a4c61b268ae71d2f5c416d0527094fbcb82343a40c84024ca83aee90bf62adda1d3d86d96d5eed957f15324eb9e30e WHIRLPOOL 65d8f76efc1b108ad02e59ddb30ad22d22bd7fe3f47a3870ff2bfca2b6142068658cddcd4cecdbeec10f9ce0ee9e32b3d03a155a8ddfd9e671a4ff499e884c94
+MISC ChangeLog 3963 SHA256 88471c8f0fb116359020be14a9340fb061bfd224b960b75f351c698e227d9ae6 SHA512 4d0f9c4faab9b4d4199ba1f8ea7cef8f0f2ab480dfdd3ade1d6bcb59e09692848fc189c283e27a57e6f1198f753821bef49ca9b8ec62c633a9bb37ff60fc9406 WHIRLPOOL a00d9ba02cb50e13193ee01b5cd0a7a5d30fea00cb7f6a443783ae5d8ffb5f76fb79562ffa151a7bb3291bad22fb6309f61e7554b538d911e2c300cedb3c4146
+MISC metadata.xml 607 SHA256 3b5d959886abeea161e0efaccfaaf040c70bd368015258fbe6ce40c8045772be SHA512 70f6172743418efe83d6a2ede1bb1ae38ef58abfd4326f9303af77e6b752c99a6a20eec300e4eeca514a762d68920a68ab14dc64969641066508dbf57388ab70 WHIRLPOOL ab10af06f7d3763f63588140dd6b6dae3448ee5a30c36c6e856f12cf6f0a24b0189f63667e0f5b2ad0dda566db4f342969edb879b675d1e644dd697b3b4fc01d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlAcCDMACgkQ1ycZbhPLE2D5MACfdPOHmB0vvdnG7VmLpBM4KL2Y
-4DwAn1yeVrt8xcE0j0FyEEYgujBHkDsF
-=lkSK
+iEYEAREIAAYFAlDIsFEACgkQgAnW8HDreRaGywCgyTfb3IuTPV81a7tztbaDrgJ/
+Y+8AnjNNkwjDWRydV4dgfKrATWSdlU+C
+=nZrd
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/clapack/clapack-3.2.1-r7.ebuild b/sci-libs/clapack/clapack-3.2.1-r7.ebuild
new file mode 100644
index 000000000000..0e161d744f52
--- /dev/null
+++ b/sci-libs/clapack/clapack-3.2.1-r7.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2012 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-r7.ebuild,v 1.1 2012/12/12 16:26:56 jlec Exp $
+
+EAPI=4
+
+inherit flag-o-matic 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 ~amd64-linux ~x86-linux"
+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}-hang.patch"
+	"${FILESDIR}/${P}-findblas-r7.patch"
+)
+
+src_configure() {
+	filter-flags -ftree-vectorize
+	# causes an internal compiler error with gcc-4.6.2
+
+	local mycmakeargs=( $(cmake-utils_use_enable test TESTS) )
+	cmake-utils_src_configure
+}
diff --git a/sci-libs/clapack/files/clapack-3.2.1-findblas-r7.patch b/sci-libs/clapack/files/clapack-3.2.1-findblas-r7.patch
new file mode 100644
index 000000000000..c82cd50a2c5b
--- /dev/null
+++ b/sci-libs/clapack/files/clapack-3.2.1-findblas-r7.patch
@@ -0,0 +1,84 @@
+ CMakeLists.txt         | 29 +++++++++++++++++++++++++++--
+ SRC/CMakeLists.txt     |  7 ++++++-
+ TESTING/CMakeLists.txt |  5 +++++
+ 3 files changed, 38 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 37fb433..fe29d4c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -28,7 +28,33 @@ set(CPACK_PACKAGE_VERSION_MAJOR 3)
+ set(CPACK_PACKAGE_VERSION_MINOR 2)
+ set(CPACK_PACKAGE_VERSION_PATCH 1)
+ 
+-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(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)
++
++if(BLAS_LIBRARY_DIRS)
++#   SET_TARGET_PROPERTIES(clapack PROPERTIES LINK_FLAGS ${LINK_FLAGS} -L"${BLAS_LIBRARY_DIRS}")
++	SET (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -L\"${BLAS_LIBRARY_DIRS}\"")
++endif()
+ 
+ add_subdirectory(SRC)
+ 
+@@ -44,4 +70,3 @@ configure_file(${CLAPACK_SOURCE_DIR}/clapack-config-version.cmake.in
+   ${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 --git a/SRC/CMakeLists.txt b/SRC/CMakeLists.txt
+index 7b75ee9..39380ed 100644
+--- a/SRC/CMakeLists.txt
++++ b/SRC/CMakeLists.txt
+@@ -376,8 +376,13 @@ if(BUILD_COMPLEX16)
+   set(ALLOBJ  ${ZLASRC} ${ALLAUX} ${DZLAUX})
+ endif()
+ 
++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
++
+ add_library(clapack SHARED ${ALLOBJ} ${ALLXOBJ})
+-target_link_libraries(clapack blas f2c m)
++target_link_libraries(clapack ${BLAS_LIBRARIES} f2c m)
++if(BLAS_LIBRARY_DIRS)
++	SET_TARGET_PROPERTIES(clapack PROPERTIES LINK_FLAGS ${LINK_FLAGS} -L"${BLAS_LIBRARY_DIRS}")
++endif()
+ set_target_properties(clapack PROPERTIES SOVERSION "${CLAPACK_VERSION}")
+ 
+ install(
+diff --git a/TESTING/CMakeLists.txt b/TESTING/CMakeLists.txt
+index d59359d..174672e 100644
+--- a/TESTING/CMakeLists.txt
++++ b/TESTING/CMakeLists.txt
+@@ -4,6 +4,11 @@ if(MSVC_VERSION)
+   string(REGEX REPLACE "(.*)/STACK:(.*) (.*)" "\\1/STACK:900000000000000000 \\3"
+     CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS}")
+ endif()
++if(BLAS_LIBRARY_DIRS)
++#   SET_TARGET_PROPERTIES(clapack PROPERTIES LINK_FLAGS ${LINK_FLAGS} -L"${BLAS_LIBRARY_DIRS}")
++       SET (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -L\"${BLAS_LIBRARY_DIRS}\"")
++endif()
++
+ add_subdirectory(MATGEN)
+ add_subdirectory(LIN)
+ add_subdirectory(EIG)
diff --git a/sci-libs/clapack/metadata.xml b/sci-libs/clapack/metadata.xml
index 054845427e54..fe3f51cd1a6d 100644
--- a/sci-libs/clapack/metadata.xml
+++ b/sci-libs/clapack/metadata.xml
@@ -1,7 +1,8 @@
+<?xml version="1.0"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
-<longdescription lang="en">
+  <herd>sci</herd>
+  <longdescription lang="en">
   LAPACK is a comprehensive library that does linear algebra
   operations including matrix inversions, least squared solutions to
   linear sets of equations, eigenvector analysis, singular value