From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ricardo Wurmus Subject: [PATCH] Fix R. Date: Wed, 24 Jun 2015 11:40:31 +0200 Message-ID: Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:37336) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z7hAk-0002XW-Jm for guix-devel@gnu.org; Wed, 24 Jun 2015 05:40:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z7hAf-0005J7-KB for guix-devel@gnu.org; Wed, 24 Jun 2015 05:40:46 -0400 Received: from sinope.bbbm.mdc-berlin.de ([141.80.25.23]:54268) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z7hAf-0005Iq-9Q for guix-devel@gnu.org; Wed, 24 Jun 2015 05:40:41 -0400 Received: from localhost (localhost [127.0.0.1]) by sinope.bbbm.mdc-berlin.de (Postfix) with ESMTP id 9C474280907 for ; Wed, 24 Jun 2015 11:40:38 +0200 (CEST) Received: from sinope.bbbm.mdc-berlin.de ([127.0.0.1]) by localhost (sinope.bbbm.mdc-berlin.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id WsZB69PF1hQX for ; Wed, 24 Jun 2015 11:40:32 +0200 (CEST) Received: from HTCAONE.mdc-berlin.net (mab.citx.mdc-berlin.de [141.80.36.102]) by sinope.bbbm.mdc-berlin.de (Postfix) with ESMTP for ; Wed, 24 Jun 2015 11:40:32 +0200 (CEST) List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: "guix-devel@gnu.org" --=-=-= Content-Type: text/plain 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. --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename="0001-gnu-Add-gfortran-4.9.patch" >From 6c25bf3435fc690c75ba7bbf2b98c60bf5261cfc Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus 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 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename="0002-gnu-r-Use-gfortran-4.9.patch" >From 2a5f0deb7aa00be00e43f120bab8e5d97c6a9a51 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus 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 --=-=-=--