diff --git a/gnu/packages/glicid.scm b/gnu/packages/glicid.scm index 3493bbc..4bba6ff 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 @@ -182,73 +184,9 @@ ) ) -;;(define-public glicid-fortan-toolchain-8 -;; (make-gcc-toolchain gfortran)) -;;(define-public glicid-fortran-toolchain-9 -;; (make-gcc-toolchain gfortan)) +(define-public glicid-gfortran-9 gfortran-9) +(define-public glicid-gfortran-10 gfortran-10) -(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 - (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-public gfortran-9 -; (hidden-package -; (custom-gcc gcc-9 "gfortran" '("fortran") -; %generic-search-paths))) - -;(define-public gfortran-10 -; (hidden-package -; (custom-gcc gcc-10 "gfortran" '("fortran") -; %generic-search-paths))) -; -;(define-public glicid-gfortran-9 gfortran-9) -;(define-public glicid-gfortran-10 gfortran-10) - ;;; glicid.scm ends here