openmolcas: fix build w.r.t. openblas
Fall out from switching openblas over to multiple outputs: https://github.com/NixOS/nixpkgs/pull/98337
This commit is contained in:
parent
7ef527cff8
commit
8b02ff6b8e
@ -23,7 +23,10 @@ in stdenv.mkDerivation {
|
|||||||
sha256 = "1wwqhkyyi7pw5x1ghnp83ir17zl5jsj7phhqxapybyi3bmg0i00q";
|
sha256 = "1wwqhkyyi7pw5x1ghnp83ir17zl5jsj7phhqxapybyi3bmg0i00q";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [ (fetchpatch {
|
patches = [
|
||||||
|
# Required to handle openblas multiple outputs
|
||||||
|
./openblasPath.patch
|
||||||
|
(fetchpatch {
|
||||||
name = "Fix-MPI-INT-size"; # upstream patch, fixes a Fortran compiler error
|
name = "Fix-MPI-INT-size"; # upstream patch, fixes a Fortran compiler error
|
||||||
url = "https://gitlab.com/Molcas/OpenMolcas/commit/860e3350523f05ab18e49a428febac8a4297b6e4.patch";
|
url = "https://gitlab.com/Molcas/OpenMolcas/commit/860e3350523f05ab18e49a428febac8a4297b6e4.patch";
|
||||||
sha256 = "0h96h5ikbi5l6ky41nkxmxfhjiykkiifq7vc2s3fdy1r1siv09sb";
|
sha256 = "0h96h5ikbi5l6ky41nkxmxfhjiykkiifq7vc2s3fdy1r1siv09sb";
|
||||||
@ -55,7 +58,7 @@ in stdenv.mkDerivation {
|
|||||||
"-DTOOLS=ON"
|
"-DTOOLS=ON"
|
||||||
"-DHDF5=ON"
|
"-DHDF5=ON"
|
||||||
"-DFDE=ON"
|
"-DFDE=ON"
|
||||||
"-DOPENBLASROOT=${openblas}"
|
"-DOPENBLASROOT=${openblas.dev}"
|
||||||
];
|
];
|
||||||
|
|
||||||
GAROOT=globalarrays;
|
GAROOT=globalarrays;
|
||||||
|
@ -0,0 +1,13 @@
|
|||||||
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||||
|
index 055ff8ef..3f60279b 100644
|
||||||
|
--- a/CMakeLists.txt
|
||||||
|
+++ b/CMakeLists.txt
|
||||||
|
@@ -1436,7 +1436,7 @@ if (LINALG STREQUAL "OpenBLAS")
|
||||||
|
NAMES openblas
|
||||||
|
PATHS ${OPENBLASROOT}
|
||||||
|
PATH_SUFFIXES lib
|
||||||
|
- NO_DEFAULT_PATH)
|
||||||
|
+ )
|
||||||
|
|
||||||
|
if (NOT LIBOPENBLAS)
|
||||||
|
message (FATAL_ERROR
|
Loading…
Reference in New Issue
Block a user