From 020ab39125c1136ce0f4117d782c9e960a7e0c5a Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 22 Nov 2021 22:12:37 +0100 Subject: [PATCH] =?UTF-8?q?gcc10=20and=20gcc11=20variants=C2=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- glicid/packages/mpi.scm | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/glicid/packages/mpi.scm b/glicid/packages/mpi.scm index 96ba21b..4aef1c7 100644 --- a/glicid/packages/mpi.scm +++ b/glicid/packages/mpi.scm @@ -114,17 +114,20 @@ (use-modules (guix transformations)) -;(define transform-to-gcc11 -; ;; The package transformation procedure. -; (options->transformation -; '( -; (with-c-toolchain . "gcc-toolchain@11")))) (define gcc11-instead-of-gcc ;; This is a procedure to replace GCC by GCC11, ;; recursively. (package-input-rewriting `((,gcc-toolchain . ,gcc-toolchain-11)))) +(define gcc10-instead-of-gcc + ;; This is a procedure to replace GCC by GCC10, + ;; recursively. + (package-input-rewriting `((,gcc-toolchain . ,gcc-toolchain-10)))) + + +(define openmpi-glicid-transform-gcc-10 + (gcc10-instead-of-gcc openmpi-glicid)) (define openmpi-glicid-transform-gcc-11 (gcc11-instead-of-gcc openmpi-glicid)) @@ -132,6 +135,13 @@ (define-public openmpi-glicid-gcc-11 (package (inherit openmpi-glicid-transform-gcc-11) - (version (string-append (package-version gnu:openmpi) "-gcc-11" )) + (version (string-append (package-version openmpi-glicid-transform-gcc-11) "-gcc-11" )) ) -) \ No newline at end of file +) + +(define-public openmpi-glicid-gcc-10 + (package + (inherit openmpi-glicid-transform-gcc-10) + (version (string-append (package-version openmpi-glicid-transform-gcc-10) "-gcc-10" )) + ) +)