diff options
| author |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2011-06-19 20:35:56 +0000 |
|---|---|---|
| committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2011-06-19 20:35:56 +0000 |
| commit | cc1e4da737e47483b1e8b053352262e3e735cd5f (patch) | |
| tree | eb7d3d3f7ced480ee3968d150f1041a1955b8fef /sci-libs/clapack/files | |
| parent | new bootstrap for x86 (diff) | |
| download | gentoo-2-cc1e4da737e47483b1e8b053352262e3e735cd5f.tar.gz gentoo-2-cc1e4da737e47483b1e8b053352262e3e735cd5f.tar.bz2 gentoo-2-cc1e4da737e47483b1e8b053352262e3e735cd5f.zip | |
Fix hang from KDE bug 274940; find blas using PkgConfig
(Portage version: 2.1.10.3/cvs/Linux x86_64)
Diffstat (limited to 'sci-libs/clapack/files')
| -rw-r--r-- | sci-libs/clapack/files/clapack-3.2.1-findblas-r6.patch | 50 | ||||
| -rw-r--r-- | sci-libs/clapack/files/clapack-3.2.1-hang.patch | 15 |
2 files changed, 65 insertions, 0 deletions
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 000000000000..028dec609dd8 --- /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-CMAKE/CMakeLists.txt +--- clapack-3.2.1-CMAKE.1.allexfb/CMakeLists.txt 2011-06-19 22:13:27.000000000 +0200 ++++ clapack-3.2.1-CMAKE/CMakeLists.txt 2011-06-19 22:23:14.000000000 +0200 +@@ -30,6 +30,29 @@ + + 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) ++ + add_subdirectory(SRC) + + 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() + + 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( diff --git a/sci-libs/clapack/files/clapack-3.2.1-hang.patch b/sci-libs/clapack/files/clapack-3.2.1-hang.patch new file mode 100644 index 000000000000..648516f78e34 --- /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=274940 + +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 2009-08-10 19:47:54.000000000 +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 + zla_lin_berr.c zlarscl2.c zlascl2.c zla_wwaddw.c) + ++if(CMAKE_COMPILER_IS_GNUCXX) ++ set_source_files_properties(dlamch.c slamch.c PROPERTIES COMPILE_FLAGS "-ffloat-store -O0") ++endif() + + if( USEXBLAS) + set(ALLXOBJ ${SXLASRC} ${DXLASRC} ${CXLASRC} ${ZXLASRC} ${ALLXAUX}) |