* [PATCH] Add default GCC and gfortran.
@ 2015-06-25 16:04 Ricardo Wurmus
2015-06-25 16:16 ` Ludovic Courtès
2015-06-25 16:21 ` Eric Bavier
0 siblings, 2 replies; 5+ messages in thread
From: Ricardo Wurmus @ 2015-06-25 16:04 UTC (permalink / raw
To: Guix-devel
[-- Attachment #1: Type: text/plain, Size: 317 bytes --]
Since we're building packages with GCC 4.9 by default, all packages that
explicitly depend on gfortran-4.8 might be broken. The first patch adds
a default "gcc" (set to "gcc-4.9") and a default "gfortran" based on the
default gcc.
The second patch updates all "gfortran-4.x" inputs to just "gfortran".
~~ Ricardo
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-Add-default-GCC-and-default-gfortran.patch --]
[-- Type: text/x-patch, Size: 1287 bytes --]
From de44275012ad3443b4da463eb1cc4b1c20db9b34 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de>
Date: Thu, 25 Jun 2015 17:52:10 +0200
Subject: [PATCH 1/2] gnu: Add default GCC and default gfortran.
* gnu/packages/gcc.scm (gcc): New variable.
* gnu/packages/gcc.scm (gfortran): New variable.
---
gnu/packages/gcc.scm | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm
index 389610d..4fc2e63 100644
--- a/gnu/packages/gcc.scm
+++ b/gnu/packages/gcc.scm
@@ -345,6 +345,8 @@ Go. It also includes runtime support libraries for these languages.")
'("gcc-arm-link-spec-fix.patch"
"gcc-5.0-libvtv-runpath.patch")))))))
+(define-public gcc gcc-4.9)
+
(define-public (make-libstdc++ gcc)
"Return a libstdc++ package based on GCC. The primary use case is when
using compilers other than GCC."
@@ -397,6 +399,9 @@ using compilers other than GCC."
(define-public gfortran-4.9
(custom-gcc gcc-4.9 "gfortran" '("fortran")))
+(define-public gfortran
+ (custom-gcc gcc "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
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: 0002-gnu-Replace-versioned-gfortran-inputs-with-just-gfor.patch --]
[-- Type: text/x-patch, Size: 7795 bytes --]
From bb3ccc2f94e7d8971dd3bb7768795c850f3e5a59 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de>
Date: Thu, 25 Jun 2015 17:56:07 +0200
Subject: [PATCH 2/2] gnu: Replace versioned gfortran inputs with just
"gfortran".
* gnu/packages/julia.scm (julia)[inputs]: Replace "gfortran-4.8" with
"gfortran".
* gnu/packages/machine-learning.scm (randomjungle)[native-inputs]: Likewise.
* gnu/packages/maths.scm (arpack-ng)[inputs]: Likewise.
* gnu/packages/maths.scm (lapack)[inputs]: Likewise.
* gnu/packages/maths.scm (octave)[native-inputs]: Likewise.
* gnu/packages/maths.scm (gmsh)[propagated-inputs]: Likewise.
* gnu/packages/maths.scm (petsc)[inputs]: Likewise.
* gnu/packages/maths.scm (superlu)[inputs]: Likewise.
* gnu/packages/maths.scm (superlu-dist)[inputs]: Likewise.
* gnu/packages/maths.scm (openblas)[inputs]: Likewise.
* gnu/packages/maths.scm (openspecfun)[inputs]: Likewise.
* gnu/packages/maths.scm (atlas)[inputs]: Likewise.
* gnu/packages/mpi.scm (openmpi)[inputs]: Likewise.
* gnu/packages/python.scm (python-numpy-bootstrap)[native-inputs]: Likewise.
* gnu/packages/python.scm (python-scipy)[native-inputs]: Likewise.
* gnu/packages/statistics.scm (r)[inputs]: Replace "gfortran-4.9" with
"gfortran".
---
gnu/packages/julia.scm | 2 +-
gnu/packages/machine-learning.scm | 2 +-
gnu/packages/maths.scm | 20 ++++++++++----------
gnu/packages/mpi.scm | 2 +-
gnu/packages/python.scm | 4 ++--
gnu/packages/statistics.scm | 2 +-
6 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/gnu/packages/julia.scm b/gnu/packages/julia.scm
index 9eb4bad..4473109 100644
--- a/gnu/packages/julia.scm
+++ b/gnu/packages/julia.scm
@@ -171,7 +171,7 @@
("double-conversion" ,double-conversion)
("fftw" ,fftw)
("fftwf" ,fftwf)
- ("fortran" ,gfortran-4.8)
+ ("fortran" ,gfortran)
("pcre" ,pcre)
("utf8proc" ,utf8proc)
("git" ,git)
diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm
index cfeb1da..30209f5 100644
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@ -133,7 +133,7 @@ classification.")
("libxml2" ,libxml2)
("zlib" ,zlib)))
(native-inputs
- `(("gfortran" ,gfortran-4.8)))
+ `(("gfortran" ,gfortran)))
(home-page "http://www.imbs-luebeck.de/imbs/de/node/227/")
(synopsis "Implementation of the Random Forests machine learning method")
(description
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 421baf5..4e0b1ee 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -265,7 +265,7 @@ be output in text, PostScript, PDF or HTML.")
(home-page "https://github.com/opencollab/arpack-ng")
(inputs
`(("lapack" ,lapack)
- ("fortran" ,gfortran-4.8)))
+ ("fortran" ,gfortran)))
(synopsis "Fortran subroutines for solving eigenvalue problems")
(description
"ARPACK-NG is a collection of Fortran77 subroutines designed to solve
@@ -287,7 +287,7 @@ large scale eigenvalue problems.")
"0lk3f97i9imqascnlf6wr5mjpyxqcdj73pgj97dj2mgvyg9z1n4s"))))
(build-system cmake-build-system)
(home-page "http://www.netlib.org/lapack/")
- (inputs `(("fortran" ,gfortran-4.8)
+ (inputs `(("fortran" ,gfortran)
("python" ,python-2)))
(arguments
`(#:configure-flags '("-DBUILD_SHARED_LIBS:BOOL=YES")
@@ -400,7 +400,7 @@ extremely large and complex data collections.")
("glu" ,glu)
("zlib" ,zlib)))
(native-inputs
- `(("gfortran" ,gfortran-4.8)
+ `(("gfortran" ,gfortran)
("pkg-config" ,pkg-config)
("perl" ,perl)
;; The following inputs are not actually used in the build process.
@@ -445,7 +445,7 @@ script files.")
(build-system cmake-build-system)
(propagated-inputs
`(("fltk" ,fltk)
- ("gfortran" ,gfortran-4.8)
+ ("gfortran" ,gfortran)
("gmp" ,gmp)
("hdf5" ,hdf5)
("lapack" ,lapack)
@@ -487,7 +487,7 @@ ASCII text files using Gmsh's own scripting language.")
`(("python" ,python-2)
("perl" ,perl)))
(inputs
- `(("gfortran" ,gfortran-4.8)
+ `(("gfortran" ,gfortran)
("lapack" ,lapack)
("superlu" ,superlu)
;; leaving out hdf5 and fftw, as petsc expects them to be built with mpi
@@ -615,7 +615,7 @@ scientific applications modeled by partial differential equations.")
`(("tcsh" ,tcsh)))
(inputs
`(("lapack" ,lapack)
- ("gfortran" ,gfortran-4.8)))
+ ("gfortran" ,gfortran)))
(arguments
`(#:parallel-build? #f
#:tests? #f ;tests are run as part of `make all`
@@ -697,7 +697,7 @@ also provides threshold-based ILU factorization preconditioners.")
(native-inputs
`(("tcsh" ,tcsh)))
(inputs
- `(("gfortran" ,gfortran-4.8)))
+ `(("gfortran" ,gfortran)))
(propagated-inputs
`(("openmpi" ,openmpi) ;headers include MPI heades
("lapack" ,lapack) ;required to link with output library
@@ -1103,7 +1103,7 @@ constant parts of it.")
;; no configure script
#:phases (alist-delete 'configure %standard-phases)))
(inputs
- `(("fortran" ,gfortran-4.8)))
+ `(("fortran" ,gfortran)))
(native-inputs
`(("cunit" ,cunit)
("perl" ,perl)))
@@ -1171,7 +1171,7 @@ environments.")
;; no configure script
#:phases (alist-delete 'configure %standard-phases)))
(inputs
- `(("fortran" ,gfortran-4.8)))
+ `(("fortran" ,gfortran)))
(home-page "https://github.com/JuliaLang/openspecfun")
(synopsis "Collection of special mathematical functions")
(description
@@ -1254,7 +1254,7 @@ packages.")
"0bqh4bdnjdyww4mcpg6kn0x7338mfqbdgysn97dzrwwb26di7ars"))))
(build-system gnu-build-system)
(home-page "http://math-atlas.sourceforge.net/")
- (inputs `(("gfortran" ,gfortran-4.8)
+ (inputs `(("gfortran" ,gfortran)
("lapack-tar" ,(package-source lapack))))
(outputs '("out" "doc"))
;; For the moment we drop support for MIPS at it fails to compile. See
diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm
index a268239..8e62da9 100644
--- a/gnu/packages/mpi.scm
+++ b/gnu/packages/mpi.scm
@@ -97,7 +97,7 @@ bind processes, and much more.")
(build-system gnu-build-system)
(inputs
`(("hwloc" ,hwloc)
- ("gfortran" ,gfortran-4.8)
+ ("gfortran" ,gfortran)
("valgrind" ,valgrind)))
(native-inputs
`(("pkg-config" ,pkg-config)))
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 9876a3f..2fc5409 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -2275,7 +2275,7 @@ writing C extensions for Python as easy as Python itself.")
("openblas" ,openblas)
("lapack" ,lapack)))
(native-inputs
- `(("gfortran" ,gfortran-4.8)))
+ `(("gfortran" ,gfortran)))
(arguments
`(#:phases
(alist-cons-before
@@ -2686,7 +2686,7 @@ toolkits.")
("lapack" ,lapack)
("openblas" ,openblas)))
(native-inputs
- `(("gfortran" ,gfortran-4.8)
+ `(("gfortran" ,gfortran)
("texlive" ,texlive)
("perl" ,perl)))
(outputs '("out" "doc"))
diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index 8d5d4c3..0b9e081 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.9)
+ ("gfortran" ,gfortran)
("icu4c" ,icu4c)
("icedtea6" ,icedtea6 "jdk")
("lapack" ,lapack)
--
2.1.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] Add default GCC and gfortran.
2015-06-25 16:04 [PATCH] Add default GCC and gfortran Ricardo Wurmus
@ 2015-06-25 16:16 ` Ludovic Courtès
2015-06-25 16:21 ` Eric Bavier
1 sibling, 0 replies; 5+ messages in thread
From: Ludovic Courtès @ 2015-06-25 16:16 UTC (permalink / raw
To: Ricardo Wurmus; +Cc: Guix-devel
Both look good to me, thanks!
We should also change occurrences of ‘gcc-4.9’ to ‘gcc’, but I can do
that later (there might be exceptions.)
Thanks!
Ludo’.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] Add default GCC and gfortran.
2015-06-25 16:04 [PATCH] Add default GCC and gfortran Ricardo Wurmus
2015-06-25 16:16 ` Ludovic Courtès
@ 2015-06-25 16:21 ` Eric Bavier
2015-06-25 20:23 ` Ludovic Courtès
1 sibling, 1 reply; 5+ messages in thread
From: Eric Bavier @ 2015-06-25 16:21 UTC (permalink / raw
To: Ricardo Wurmus; +Cc: Guix-devel, guix-devel-bounces+ericbavier=openmailbox.org
Thanks for the patch!
On 2015-06-25 11:04, Ricardo Wurmus wrote:
> * gnu/packages/julia.scm (julia)[inputs]: Replace "gfortran-4.8" with
> "gfortran".
> * gnu/packages/machine-learning.scm (randomjungle)[native-inputs]:
> Likewise.
> * gnu/packages/maths.scm (arpack-ng)[inputs]: Likewise.
> * gnu/packages/maths.scm (lapack)[inputs]: Likewise.
> * gnu/packages/maths.scm (octave)[native-inputs]: Likewise.
> * gnu/packages/maths.scm (gmsh)[propagated-inputs]: Likewise.
> * gnu/packages/maths.scm (petsc)[inputs]: Likewise.
> * gnu/packages/maths.scm (superlu)[inputs]: Likewise.
> * gnu/packages/maths.scm (superlu-dist)[inputs]: Likewise.
> * gnu/packages/maths.scm (openblas)[inputs]: Likewise.
> * gnu/packages/maths.scm (openspecfun)[inputs]: Likewise.
> * gnu/packages/maths.scm (atlas)[inputs]: Likewise.
> * gnu/packages/mpi.scm (openmpi)[inputs]: Likewise.
> * gnu/packages/python.scm (python-numpy-bootstrap)[native-inputs]:
> Likewise.
> * gnu/packages/python.scm (python-scipy)[native-inputs]: Likewise.
> * gnu/packages/statistics.scm (r)[inputs]: Replace "gfortran-4.9" with
> "gfortran".
I think the convention would be to collapse the files references, and
just list the variables, e.g.:
* gnu/packages/maths.scm (arpack-ng, lapack, petsc, superlu)
(superlu-dist, openblas, openspecfun, atlas)[inputs]: Likewise.
(octave)[native-inputs]: Likewise.
(gmsh)[propagated-inputs]: Likewise.
--
`~Eric
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] Add default GCC and gfortran.
2015-06-25 16:21 ` Eric Bavier
@ 2015-06-25 20:23 ` Ludovic Courtès
2015-06-26 7:00 ` Ricardo Wurmus
0 siblings, 1 reply; 5+ messages in thread
From: Ludovic Courtès @ 2015-06-25 20:23 UTC (permalink / raw
To: Eric Bavier; +Cc: Guix-devel
Eric Bavier <ericbavier@openmailbox.org> skribis:
> I think the convention would be to collapse the files references, and
> just list the variables, e.g.:
>
> * gnu/packages/maths.scm (arpack-ng, lapack, petsc, superlu)
> (superlu-dist, openblas, openspecfun, atlas)[inputs]: Likewise.
> (octave)[native-inputs]: Likewise.
> (gmsh)[propagated-inputs]: Likewise.
Indeed, you’re right.
Ludo’.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] Add default GCC and gfortran.
2015-06-25 20:23 ` Ludovic Courtès
@ 2015-06-26 7:00 ` Ricardo Wurmus
0 siblings, 0 replies; 5+ messages in thread
From: Ricardo Wurmus @ 2015-06-26 7:00 UTC (permalink / raw
To: Ludovic Courtès; +Cc: Guix-devel
Ludovic Courtès <ludo@gnu.org> writes:
> Eric Bavier <ericbavier@openmailbox.org> skribis:
>
>> I think the convention would be to collapse the files references, and
>> just list the variables, e.g.:
>>
>> * gnu/packages/maths.scm (arpack-ng, lapack, petsc, superlu)
>> (superlu-dist, openblas, openspecfun, atlas)[inputs]: Likewise.
>> (octave)[native-inputs]: Likewise.
>> (gmsh)[propagated-inputs]: Likewise.
>
> Indeed, you’re right.
I pushed with that change. Thank you, Eric!
~~ Ricardo
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2015-06-26 7:00 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-06-25 16:04 [PATCH] Add default GCC and gfortran Ricardo Wurmus
2015-06-25 16:16 ` Ludovic Courtès
2015-06-25 16:21 ` Eric Bavier
2015-06-25 20:23 ` Ludovic Courtès
2015-06-26 7:00 ` Ricardo Wurmus
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.