[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH] Fix R.
From: |
Ricardo Wurmus |
Subject: |
[PATCH] Fix R. |
Date: |
Wed, 24 Jun 2015 11:40:31 +0200 |
Currently, R cannot be built because the default GCC is now 4.9 but R
depends on gfortran 4.8.
These two patches add gfortran-4.9 and update the R package to use it.
>From 6c25bf3435fc690c75ba7bbf2b98c60bf5261cfc Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <address@hidden>
Date: Wed, 24 Jun 2015 11:36:18 +0200
Subject: [PATCH 1/2] gnu: Add gfortran 4.9.
* gnu/packages/gcc.scm (gfortran-4.9): New variable.
---
gnu/packages/gcc.scm | 3 +++
1 file changed, 3 insertions(+)
diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm
index c370fe8..389610d 100644
--- a/gnu/packages/gcc.scm
+++ b/gnu/packages/gcc.scm
@@ -394,6 +394,9 @@ using compilers other than GCC."
(define-public gfortran-4.8
(custom-gcc gcc-4.8 "gfortran" '("fortran")))
+(define-public gfortran-4.9
+ (custom-gcc gcc-4.9 "gfortran" '("fortran")))
+
(define-public gccgo-4.8
(custom-gcc gcc-4.8 "gccgo" '("go")
;; Suppress the separate "lib" output, because otherwise the
--
2.1.0
>From 2a5f0deb7aa00be00e43f120bab8e5d97c6a9a51 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <address@hidden>
Date: Wed, 24 Jun 2015 11:37:56 +0200
Subject: [PATCH 2/2] gnu: r: Use gfortran-4.9.
* gnu/packages/statistics.scm (r)[inputs]: Replace gfortran-4.8 with
gfortran-4.9.
---
gnu/packages/statistics.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index 9408705..8d5d4c3 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -90,7 +90,7 @@
(inputs
`(("atlas" ,atlas) ; --with-blas
("cairo" ,cairo)
- ("gfortran" ,gfortran-4.8)
+ ("gfortran" ,gfortran-4.9)
("icu4c" ,icu4c)
("icedtea6" ,icedtea6 "jdk")
("lapack" ,lapack)
--
2.1.0
- [PATCH] Fix R.,
Ricardo Wurmus <=