From 947a620e8bde3204459ad1843fc677995d6132ef Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 11 May 2020 15:57:58 +0200 Subject: [PATCH 1/5] WIP --- gnu/packages/glicid.scm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 3fca9de..42d3127 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -95,6 +95,8 @@ )) )) +(define-public glicid-custom-slurm glicid-custom-slurm-19.05) + (define-public glicid-custom-slurm-20.02 (package (inherit glicid-custom-slurm-19.05) @@ -108,7 +110,7 @@ )) )) -(define-public glicid-custom-slurm glicid-custom-slurm-19.05) + (define-public glicid-ceph-14 (package @@ -239,16 +241,16 @@ as the 'native-search-paths' field." (define-public gfortran-9 - (hidden-package (custom-gcc gcc-9 "gfortran" '("fortran") - %generic-search-paths))) + %generic-search-paths)) (define-public gfortran-10 - (hidden-package (custom-gcc gcc-10 "gfortran" '("fortran") - %generic-search-paths))) + %generic-search-paths)) (define-public glicid-gfortran-9 gfortran-9) (define-public glicid-gfortran-10 gfortran-10) + + ;;; glicid.scm ends here From e3aa03bc6055068754a7bf216c4e3e1183477812 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 11 May 2020 16:19:09 +0200 Subject: [PATCH 2/5] WIP --- gnu/packages/glicid.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 42d3127..543ec57 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -95,7 +95,7 @@ )) )) -(define-public glicid-custom-slurm glicid-custom-slurm-19.05) +;; (define-public glicid-custom-slurm glicid-custom-slurm-19.05) (define-public glicid-custom-slurm-20.02 (package @@ -248,8 +248,8 @@ as the 'native-search-paths' field." (custom-gcc gcc-10 "gfortran" '("fortran") %generic-search-paths)) -(define-public glicid-gfortran-9 gfortran-9) -(define-public glicid-gfortran-10 gfortran-10) +;;(define-public glicid-gfortran-9 gfortran-9) +;;(define-public glicid-gfortran-10 gfortran-10) From a7dfc71ae17b2ee7102affcda0b3ab6c33acd72d Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 11 May 2020 16:39:00 +0200 Subject: [PATCH 3/5] WIP --- gnu/packages/glicid.scm | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 543ec57..8eda7e2 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -184,26 +184,6 @@ ) ) -;;(define-public glicid-fortan-toolchain-8 -;; (make-gcc-toolchain gfortran)) - -;;(define-public glicid-fortran-toolchain-9 -;; (make-gcc-toolchain gfortan)) - - -(define %generic-search-paths - ;; This is the language-neutral search path for GCC. Entries in $CPATH are - ;; not considered "system headers", which means GCC can raise warnings for - ;; issues in those headers. 'CPATH' is the only one that works for - ;; front-ends not in the C family. - (list (search-path-specification - (variable "CPATH") - (files '("include"))) - (search-path-specification - (variable "LIBRARY_PATH") - (files '("lib" "lib64"))))) - - (define* (custom-gcc gcc name languages #:optional @@ -248,8 +228,8 @@ as the 'native-search-paths' field." (custom-gcc gcc-10 "gfortran" '("fortran") %generic-search-paths)) -;;(define-public glicid-gfortran-9 gfortran-9) -;;(define-public glicid-gfortran-10 gfortran-10) +(define-public glicid-gfortran-9 gfortran-9) +(define-public glicid-gfortran-10 gfortran-10) From 2c419542672d04bb054b343f28ee8e2fb3bd05c3 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 11 May 2020 16:43:54 +0200 Subject: [PATCH 4/5] WIP --- gnu/packages/glicid.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 8eda7e2..74af1e0 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -219,6 +219,17 @@ as the 'native-search-paths' field." ".*(c\\+\\+|cpp|g\\+\\+|gcov|gcc|gcc-.*)")) #t)))))))) +(define %generic-search-paths + ;; This is the language-neutral search path for GCC. Entries in $CPATH are + ;; not considered "system headers", which means GCC can raise warnings for + ;; issues in those headers. 'CPATH' is the only one that works for + ;; front-ends not in the C family. + (list (search-path-specification + (variable "CPATH") + (files '("include"))) + (search-path-specification + (variable "LIBRARY_PATH") + (files '("lib" "lib64"))))) (define-public gfortran-9 (custom-gcc gcc-9 "gfortran" '("fortran") From 7f83f288fe3da9e8ba80bd7b158e4ade96fe9b94 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 11 May 2020 16:57:03 +0200 Subject: [PATCH 5/5] =?UTF-8?q?attention,=20gcc.scm=20est=20patch=C3=A9...?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gnu/packages/glicid.scm | 66 +++++++---------------------------------- 1 file changed, 10 insertions(+), 56 deletions(-) diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 74af1e0..97df735 100644 --- a/gnu/packages/glicid.scm +++ b/gnu/packages/glicid.scm @@ -185,62 +185,16 @@ ) -(define* (custom-gcc gcc name languages - #:optional - (search-paths (package-native-search-paths gcc)) - #:key (separate-lib-output? #t)) - "Return a custom version of GCC that supports LANGUAGES. Use SEARCH-PATHS -as the 'native-search-paths' field." - (package (inherit gcc) - (name name) - (outputs (if separate-lib-output? - (package-outputs gcc) - (delete "lib" (package-outputs gcc)))) - (native-search-paths search-paths) - (properties (alist-delete 'hidden? (package-properties gcc))) - (arguments - (substitute-keyword-arguments (package-arguments gcc) - ((#:modules modules %gnu-build-system-modules) - `(,@modules - (srfi srfi-1) - (srfi srfi-26) - (ice-9 regex))) - ((#:configure-flags flags) - `(cons (string-append "--enable-languages=" - ,(string-join languages ",")) - (remove (cut string-match "--enable-languages.*" <>) - ,flags))) - ((#:phases phases) - `(modify-phases ,phases - (add-after 'install 'remove-broken-or-conflicting-files - (lambda* (#:key outputs #:allow-other-keys) - (for-each delete-file - (find-files (string-append (assoc-ref outputs "out") "/bin") - ".*(c\\+\\+|cpp|g\\+\\+|gcov|gcc|gcc-.*)")) - #t)))))))) - -(define %generic-search-paths - ;; This is the language-neutral search path for GCC. Entries in $CPATH are - ;; not considered "system headers", which means GCC can raise warnings for - ;; issues in those headers. 'CPATH' is the only one that works for - ;; front-ends not in the C family. - (list (search-path-specification - (variable "CPATH") - (files '("include"))) - (search-path-specification - (variable "LIBRARY_PATH") - (files '("lib" "lib64"))))) - -(define-public gfortran-9 - (custom-gcc gcc-9 "gfortran" '("fortran") - %generic-search-paths)) - -(define-public gfortran-10 - (custom-gcc gcc-10 "gfortran" '("fortran") - %generic-search-paths)) - -(define-public glicid-gfortran-9 gfortran-9) -(define-public glicid-gfortran-10 gfortran-10) +;(define-public gfortran-9 +; (custom-gcc gcc-9 "gfortran" '("fortran") +; %generic-search-paths)) +; +;(define-public gfortran-10 +; (custom-gcc gcc-10 "gfortran" '("fortran") +; %generic-search-paths)) +; +;(define-public glicid-gfortran-9 gfortran-9) +;(define-public glicid-gfortran-10 gfortran-10)