mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-02-11 22:36:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: scotch: Explicitly pass "-DINTSIZE" to CMake.

Browse source 
Previously, the 'scotch' and 'pt-scotch' packages would use the default
int size, which turned out to be 32 on x86_64-linux instead of 64 as it
used to be in Scotch 6.x.

* gnu/packages/maths.scm (scotch)[arguments]: Add "-DINTSIZE" to #:configure-flags.
(scotch32)[arguments]: Likewise.
(pt-scotch)[arguments]: Likewise.
(pt-scotch32)[arguments]: Likewise.
This commit is contained in:
Ludovic Courtès 2022-03-07 16:41:33 +01:00 • committed by Ludovic Courtès
parent 667f21aea0
commit 6e09ab9f61
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
gnu/packages/maths.scm
View file

@ -3889,7 +3889,7 @@ implemented in ANSI C, and MPI for communications.")
(list flex bison gfortran)) (list flex bison gfortran))
(outputs '("out" "metis")) (outputs '("out" "metis"))
(arguments (arguments
`(#:configure-flags '("-DBUILD_SHARED_LIBS=YES" `(#:configure-flags '("-DBUILD_SHARED_LIBS=YES" "-DINTSIZE=64"
"-DBUILD_PTSCOTCH=OFF") "-DBUILD_PTSCOTCH=OFF")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
@ -3930,7 +3930,7 @@ bio-chemistry.")
(substitute-keyword-arguments (package-arguments scotch) (substitute-keyword-arguments (package-arguments scotch)
((#:configure-flags flags ''()) ((#:configure-flags flags ''())
''("-DBUILD_SHARED_LIBS=YES" "-DBUILD_PTSCOTCH=OFF" ''("-DBUILD_SHARED_LIBS=YES" "-DBUILD_PTSCOTCH=OFF"
"-DCMAKE_C_FLAGS=-DINTSIZE32=1")))) "-DINTSIZE=32"))))
(synopsis (synopsis
"Programs and libraries for graph algorithms (32-bit integers)"))) "Programs and libraries for graph algorithms (32-bit integers)")))
@ -3943,7 +3943,8 @@ bio-chemistry.")
(arguments (arguments
(substitute-keyword-arguments (package-arguments scotch) (substitute-keyword-arguments (package-arguments scotch)
((#:configure-flags flags ''()) ((#:configure-flags flags ''())
''("-DBUILD_SHARED_LIBS=YES" "-DBUILD_PTSCOTCH=ON")) ''("-DBUILD_SHARED_LIBS=YES" "-DBUILD_PTSCOTCH=ON"
"-DINTSIZE=64"))
((#:phases phases '%standard-phases) ((#:phases phases '%standard-phases)
`(modify-phases ,phases `(modify-phases ,phases
(add-before 'check 'mpi-setup (add-before 'check 'mpi-setup
@ -3960,7 +3961,7 @@ bio-chemistry.")
(substitute-keyword-arguments (package-arguments pt-scotch) (substitute-keyword-arguments (package-arguments pt-scotch)
((#:configure-flags flags ''()) ((#:configure-flags flags ''())
''("-DBUILD_SHARED_LIBS=YES" "-DBUILD_PTSCOTCH=ON" ''("-DBUILD_SHARED_LIBS=YES" "-DBUILD_PTSCOTCH=ON"
"-DCMAKE_C_FLAGS=-DINTSIZE32=1")))) "-DINTSIZE=32"))))
(synopsis (synopsis
"Programs and libraries for graph algorithms (with MPI and 32-bit integers)"))) "Programs and libraries for graph algorithms (with MPI and 32-bit integers)")))