diff options
| author | Luca Cirrottola <luca.cirrottola@inria.fr> | 2026-03-09 14:36:13 +0100 |
|---|---|---|
| committer | Andreas Enge <andreas@enge.fr> | 2026-03-16 10:16:40 +0100 |
| commit | de90188eeaba0195182a794959c4e3580ef2f807 (patch) | |
| tree | 75554874090a3747ae21894db0fa850601c0d5b2 | |
| parent | 60b6df6b0453bb065a773215c4afc898ac48c6e2 (diff) | |
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 <csantosb@inventati.org>
| -rw-r--r-- | gnu/packages/maths.scm | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index fa620f07688..10efa5d03f7 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -6089,23 +6089,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 @@ -6148,12 +6152,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" |