From 5f13aa7537eb8328fee9576ee88cdf70c2ba8555 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 29 Nov 2021 16:28:03 +0100 Subject: [PATCH] undefine all -gcc10 versions --- glicid/packages/benchmark.scm | 10 ---------- glicid/packages/fabric-management.scm | 10 ---------- glicid/packages/linux.scm | 21 --------------------- 3 files changed, 41 deletions(-) diff --git a/glicid/packages/benchmark.scm b/glicid/packages/benchmark.scm index d053e6f..0e78eed 100644 --- a/glicid/packages/benchmark.scm +++ b/glicid/packages/benchmark.scm @@ -152,19 +152,9 @@ ) ) -(define intel-mpi-benchmark-transform-gcc-10 - (gcc10-instead-of-gcc intel-mpi-benchmarks/openmpi-2021.3)) - (define intel-mpi-benchmark-transform-gcc-11 (gcc11-instead-of-gcc intel-mpi-benchmarks/openmpi-2021.3)) -(define-public intel-mpi-benchmarks/openmpi-2021.3-gcc-10 - (package - (inherit intel-mpi-benchmark-transform-gcc-10) - (version (string-append (package-version intel-mpi-benchmark-transform-gcc-10) "-gcc-10" )) - ) -) - (define-public intel-mpi-benchmarks/openmpi-2021.3-gcc-11 (package (inherit intel-mpi-benchmark-transform-gcc-11) diff --git a/glicid/packages/fabric-management.scm b/glicid/packages/fabric-management.scm index 9a8ac46..455940d 100644 --- a/glicid/packages/fabric-management.scm +++ b/glicid/packages/fabric-management.scm @@ -131,19 +131,9 @@ ) ) -;(define ucx-glicid-transform-gcc-10 -; (gcc10-instead-of-gcc ucx-glicid)) - (define ucx-glicid-transform-gcc-11 (gcc11-instead-of-gcc ucx-glicid)) -;(define-public ucx-glicid-gcc-10 -; (package -; (inherit ucx-glicid-transform-gcc-10) -; (version (string-append (package-version ucx-glicid-transform-gcc-10) "-gcc-10" )) -; ) -;) - (define-public ucx-glicid-gcc-11 (package (inherit ucx-glicid-transform-gcc-11) diff --git a/glicid/packages/linux.scm b/glicid/packages/linux.scm index 08af2f5..d912df2 100644 --- a/glicid/packages/linux.scm +++ b/glicid/packages/linux.scm @@ -131,20 +131,9 @@ (define local-rdma-core rdma-core-newer-38.0) (define-public rdma-core-latest local-rdma-core) - -;(define rdma-core-transform-gcc-10 -; (gcc10-instead-of-gcc rdma-core-latest)) - (define rdma-core-transform-gcc-11 (gcc11-instead-of-gcc rdma-core-latest)) -;(define-public rdma-core-gcc-10 -; (package -; (inherit rdma-core-transform-gcc-10) -; (version (string-append (package-version rdma-core-transform-gcc-10) "-gcc-10" )) -; ) -;) - (define-public rdma-core-gcc-11 (package (inherit rdma-core-transform-gcc-11) @@ -191,19 +180,9 @@ (define local-libfabric libfabric-newer-1.14.0) (define-public libfabric-latest local-libfabric) -;(define libfabric-transform-gcc-10 -; (gcc10-instead-of-gcc libfabric-latest)) - (define libfabric-transform-gcc-11 (gcc11-instead-of-gcc libfabric-latest)) -;(define-public libfabric-gcc-10 -; (package -; (inherit libfabric-transform-gcc-10) -; (version (string-append (package-version libfabric-transform-gcc-10) "-gcc-10" )) -; ) -;) - (define-public libfabric-gcc-11 (package (inherit libfabric-transform-gcc-11)