This is an automated email from the git hooks/post-receive script.
guix_mirror_bot pushed a commit to branch hpc-team
in repository guix.
The following commit(s) were added to refs/heads/hpc-team by this push:
new 3af701f095 gnu: openblas: Correctly pass make flags, switch tests on.
3af701f095 is described below
commit 3af701f095fbef7a381b78bbc850ee916617dae4
Author: Luca Cirrottola <[email protected]>
AuthorDate: Mon Mar 9 14:36:13 2026 +0100
gnu: openblas: Correctly pass make flags, switch tests on.
* gnu/packages/maths.scm (openblas)[build-system]: Use gnu-build-system.
[arguments] Fix compiler optimization options.
[phases] Skip configure phase (build from Makefile).
Merges guix/guix!7010
Change-Id: Ifbb46feeb7564e56ab66d598afda9cbcab31b5f6
Signed-off-by: Cayetano Santos <[email protected]>
---
gnu/packages/maths.scm | 29 +++++++++++++++++------------
1 file changed, 17 insertions(+), 12 deletions(-)
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index ee4b609405..0906b89e98 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -6055,23 +6055,27 @@ parts of it.")
(sha256
(base32
"1ifbbk4mg4ykm92i9b09wwbcwpyzlfzn8lhds8f3p7cbcga7q530"))))
- (build-system cmake-build-system)
+ ;; To build the package, we can either rely on a preset Makefile, or
+ ;; generate a new one through a CMake configuration.
+ ;; We choose the first option, so we delete the configure phase and we set
+ ;; the build system to gnu-build-system to build the package through the
+ ;; 'make' command.
+ (build-system gnu-build-system)
(arguments
(list
- #:build-type "Release"
- #:configure-flags
- #~(list "-DBUILD_SHARED_LIBS=ON"
- "-DBUILD_STATIC_LIBS=OFF"
- "-DCMAKE_C_FLAGS=-g"
- "-DCMAKE_Fortran_FLAGS=-g")
+ ;; Set the test target (but tests are indeed already run in the build
+ ;; phase, which calls 'make -C test all').
+ #:test-target "test"
;; No default baseline is supplied for powerpc-linux.
#:substitutable? (not (target-ppc32?))
#:make-flags
#~(list (string-append "PREFIX=" #$output)
+ "CFLAGS=-O3" ; optimization flags
+ "FFLAGS=-O3" ; optimization flags
"SHELL=bash"
- "DEBUG=1" ; enable debug symbols
- "MAKE_NB_JOBS=0" ;use jobserver for submakes
- "NO_STATIC=1" ;avoid a 67 MiB static archive
+ "DEBUG=1" ; enable debug symbols -g
+ "MAKE_NB_JOBS=0" ; use jobserver for submakes
+ "NO_STATIC=1" ; avoid a 67 MiB static archive
;; This is the maximum number of threads OpenBLAS will ever use
;; (that is, if $OPENBLAS_NUM_THREADS is greater than that, then
@@ -6114,12 +6118,13 @@ parts of it.")
((target-riscv64?)
'("TARGET=RISCV64_GENERIC"))
(else '())))
- ;; no configure script
#:phases
#~(modify-phases %standard-phases
+ ;; Skip configure phase since we rely on a preset Makefile.
+ (delete 'configure)
+ ;; Get libgfortran found when building in utest.
(add-before 'build 'set-extralib
(lambda* (#:key inputs #:allow-other-keys)
- ;; Get libgfortran found when building in utest.
(setenv "FEXTRALIB"
(string-append
"-L"