From 140fdf8583e728e4b7f40bb177609bdd3bfb507a Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 29 Nov 2021 16:32:58 +0100 Subject: [PATCH] =?UTF-8?q?suppress=20all=20gcc-10/gcc-11=C2=A0derivation?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- glicid/packages/fabric-management.scm | 27 --------------------------- glicid/packages/linux.scm | 19 ------------------- 2 files changed, 46 deletions(-) diff --git a/glicid/packages/fabric-management.scm b/glicid/packages/fabric-management.scm index 455940d..9fa98b8 100644 --- a/glicid/packages/fabric-management.scm +++ b/glicid/packages/fabric-management.scm @@ -96,7 +96,6 @@ ) - (define-public ucx-newer-1.11.2 (package (inherit gnu:ucx) @@ -115,31 +114,5 @@ (define local-ucx ucx-newer-1.11.2) -;; not working right now ;; (define-public ucx-latest (latest-version local-ucx gnu:ucx)) -(define-public ucx-latest local-ucx) ;; for now… - -(define-public ucx-glicid - (package - (inherit ucx-latest) - (version (string-append (package-version ucx-latest) "-glicid" )) - (inputs `( - ("libfabric", libfabric) ;; latest of glicid or gnu version - ("rdma-core",rdma-core) ;; latest of glicid or gnu version - - ,@(package-inputs ucx-latest))) - - ) - ) - -(define ucx-glicid-transform-gcc-11 - (gcc11-instead-of-gcc ucx-glicid)) - -(define-public ucx-glicid-gcc-11 - (package - (inherit ucx-glicid-transform-gcc-11) - (version (string-append (package-version ucx-glicid-transform-gcc-11) "-gcc-11" )) - ) -) - ;;; glicid/fabric-management.scm ends here diff --git a/glicid/packages/linux.scm b/glicid/packages/linux.scm index d912df2..5e7878c 100644 --- a/glicid/packages/linux.scm +++ b/glicid/packages/linux.scm @@ -131,15 +131,6 @@ (define local-rdma-core rdma-core-newer-38.0) (define-public rdma-core-latest local-rdma-core) -(define rdma-core-transform-gcc-11 - (gcc11-instead-of-gcc rdma-core-latest)) - -(define-public rdma-core-gcc-11 - (package - (inherit rdma-core-transform-gcc-11) - (version (string-append (package-version rdma-core-transform-gcc-11) "-gcc-11" )) - ) -) (define-public libfabric-newer-1.13.1 @@ -180,14 +171,4 @@ (define local-libfabric libfabric-newer-1.14.0) (define-public libfabric-latest local-libfabric) -(define libfabric-transform-gcc-11 - (gcc11-instead-of-gcc libfabric-latest)) - -(define-public libfabric-gcc-11 - (package - (inherit libfabric-transform-gcc-11) - (version (string-append (package-version libfabric-transform-gcc-11) "-gcc-11" )) - ) -) - ;;; glicid/linux.scm ends here