gnu: r: Update to 3.2.1.

* gnu/packages/statistics.scm (r): Update to 3.2.1.
* gnu/packages/patches/r-fix-15899.patch: Remove file.
* gnu-system.am (dist_patch_DATA): Remove it.
This commit is contained in:
Ricardo Wurmus 2015-06-29 16:02:09 +02:00
parent 82c370dea1
commit 74e03fccd3
3 changed files with 2 additions and 21 deletions

View file

@ -579,7 +579,6 @@ dist_patch_DATA = \
gnu/packages/patches/qt4-tests.patch \
gnu/packages/patches/qt5-conflicting-typedefs.patch \
gnu/packages/patches/qt5-runpath.patch \
gnu/packages/patches/r-fix-15899.patch \
gnu/packages/patches/ratpoison-shell.patch \
gnu/packages/patches/readline-link-ncurses.patch \
gnu/packages/patches/ripperx-libm.patch \

View file

@ -1,17 +0,0 @@
Without the "extern" keyword external applications linking against R (such as
Shogun, for example) might not be linkable.
See https://bugs.r-project.org/bugzilla3/show_bug.cgi?id=15899 for details
about this bug.
--- a/src/include/Rinterface.h (revision 66251)
+++ b/src/include/Rinterface.h (working copy)
@@ -84,7 +84,7 @@
void fpu_setup(Rboolean);
/* in unix/system.c */
-int R_running_as_main_program;
+extern int R_running_as_main_program;
#ifdef CSTACK_DEFNS
/* duplicating Defn.h */

View file

@ -42,7 +42,7 @@ (define-module (gnu packages statistics)
(define-public r
(package
(name "r")
(version "3.2.0")
(version "3.2.1")
(source (origin
(method url-fetch)
(uri (string-append "mirror://cran/src/base/R-"
@ -50,8 +50,7 @@ (define-public r
version ".tar.gz"))
(sha256
(base32
"0dagyqgvi8i3nw158qi2zpwm04s4ffzvnmk5niaksvxs30zrbbpm"))
(patches (list (search-patch "r-fix-15899.patch")))))
"10n9yhs55v1nnmdgsrgfncw29vq3ly70n8gvy1f4lq7l0hzvr7fm"))))
(build-system gnu-build-system)
(arguments
`(#:make-flags