public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gmsh: use openblas instead of atlas/lapack 

* openblas is properly recognized by cmake
* the cmake patch is no longer neccessary
This commit is contained in:
Markus Kowalewski 2018-11-14 11:41:46 +01:00
parent 6f2bb3c275
commit ced40eabfd
No known key found for this signature in database
GPG Key ID: 502A248E3FB4FF48
2 changed files with 2 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
pkgs/applications/science/math/gmsh/CMakeLists.txt.patch
View File

@ -1,37 +0,0 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -324,25 +324,16 @@
set_config_option(HAVE_BLAS "Blas(IntelMKL)")
set_config_option(HAVE_LAPACK "Lapack(IntelMKL)")
else(LAPACK_LIBRARIES)
- # on Linux also try to find ATLAS without a Fortran compiler, because
- # cmake ships with a buggy FindBLAS e.g. on Ubuntu Lucid Lynx
- set(ATLAS_LIBS_REQUIRED lapack f77blas cblas atlas)
- find_all_libraries(LAPACK_LIBRARIES ATLAS_LIBS_REQUIRED "" "")
+ # try with generic names
+ set(GENERIC_LIBS_REQUIRED lapack blas pthread)
+ find_all_libraries(LAPACK_LIBRARIES GENERIC_LIBS_REQUIRED "" "")
if(LAPACK_LIBRARIES)
- set_config_option(HAVE_BLAS "Blas(ATLAS)")
- set_config_option(HAVE_LAPACK "Lapack(ATLAS)")
- else(LAPACK_LIBRARIES)
- # try with generic names
- set(GENERIC_LIBS_REQUIRED lapack blas pthread)
- find_all_libraries(LAPACK_LIBRARIES GENERIC_LIBS_REQUIRED "" "")
- if(LAPACK_LIBRARIES)
- set_config_option(HAVE_BLAS "Blas(Generic)")
- set_config_option(HAVE_LAPACK "Lapack(Generic)")
- find_library(GFORTRAN_LIB gfortran)
- if(GFORTRAN_LIB)
- list(APPEND LAPACK_LIBRARIES ${GFORTRAN_LIB})
- endif(GFORTRAN_LIB)
- endif(LAPACK_LIBRARIES)
+ set_config_option(HAVE_BLAS "Blas(Generic)")
+ set_config_option(HAVE_LAPACK "Lapack(Generic)")
+ find_library(GFORTRAN_LIB gfortran)
+ if(GFORTRAN_LIB)
+ list(APPEND LAPACK_LIBRARIES ${GFORTRAN_LIB})
+ endif(GFORTRAN_LIB)
endif(LAPACK_LIBRARIES)
endif(LAPACK_LIBRARIES)
elseif(${CMAKE_SYSTEM_NAME} MATCHES "SunOS")

8
pkgs/applications/science/math/gmsh/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, cmake, blas, liblapack, gfortran, gmm, fltk, libjpeg { stdenv, fetchurl, cmake, openblasCompat, gfortran, gmm, fltk, libjpeg
, zlib, libGLU_combined, libGLU, xorg }: , zlib, libGLU_combined, libGLU, xorg }:
let version = "4.0.4"; in let version = "4.0.4"; in
@ -11,11 +11,7 @@ stdenv.mkDerivation {
sha256 = "1hvrls3xyxvn69kwicpvndrs0zhifcfkhfsxr8zkmhmn6fhnjhha"; sha256 = "1hvrls3xyxvn69kwicpvndrs0zhifcfkhfsxr8zkmhmn6fhnjhha";
}; };
# The original CMakeLists tries to use some version of the Lapack lib buildInputs = [ cmake openblasCompat gmm fltk libjpeg zlib libGLU_combined
# that is supposed to work without Fortran but didn't for me.
patches = [ ./CMakeLists.txt.patch ];
buildInputs = [ cmake blas liblapack gmm fltk libjpeg zlib libGLU_combined
libGLU xorg.libXrender xorg.libXcursor xorg.libXfixes xorg.libXext libGLU xorg.libXrender xorg.libXcursor xorg.libXfixes xorg.libXext
xorg.libXft xorg.libXinerama xorg.libX11 xorg.libSM xorg.libICE xorg.libXft xorg.libXinerama xorg.libX11 xorg.libSM xorg.libICE
]; ];