R: update to 4.0.2.

This commit is contained in:
Luke Hannan 2020-08-07 12:27:09 +02:00 committed by Johannes
parent 8cc74f0dd8
commit fe6c78837a
3 changed files with 7 additions and 39 deletions

View file

@ -2679,7 +2679,7 @@ libsmpeg-0.4.so.0 smpeg-0.4.5_3
libsmpeg2-2.0.so.0 smpeg2-2.0.0_1 libsmpeg2-2.0.so.0 smpeg2-2.0.0_1
libedac.so.1 libedac-0.18_1 libedac.so.1 libedac-0.18_1
libxlsreader.so.1 libxls-1.4.0_1 libxlsreader.so.1 libxls-1.4.0_1
libR.so R-3.3.0_2 libR.so R-4.0.2_1
libmarkdown.so.2 discount-2.2.0_3 libmarkdown.so.2 discount-2.2.0_3
libkeystone.so.0 keystone-0.9_1 libkeystone.so.0 keystone-0.9_1
libmate-slab.so.0 libmate-control-center-1.14.0_2 libmate-slab.so.0 libmate-control-center-1.14.0_2

View file

@ -1,33 +0,0 @@
From 1b588f18b1802de3370515181f9ba04a2dee3f42 Mon Sep 17 00:00:00 2001
From: maechler <maechler@00db46b3-68df-0310-9c12-caf00c1e9a41>
Date: Wed, 25 Mar 2020 09:06:23 +0000
Subject: [PATCH] update (1 / LDBL_EPSILON) to all __powerpc__
git-svn-id: https://svn.r-project.org/R/trunk@78054 00db46b3-68df-0310-9c12-caf00c1e9a41
---
src/main/arithmetic.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/arithmetic.c b/src/main/arithmetic.c
index fc7496a8908..196431c7675 100644
--- src/main/arithmetic.c
+++ src/main/arithmetic.c
@@ -1,6 +1,6 @@
/*
* R : A Computer Language for Statistical Data Analysis
- * Copyright (C) 1998--2019 The R Core Team.
+ * Copyright (C) 1998--2020 The R Core Team.
* Copyright (C) 2003--2019 The R Foundation
* Copyright (C) 1995--1997 Robert Gentleman and Ross Ihaka
*
@@ -178,8 +178,9 @@ void attribute_hidden InitArithmetic()
#if HAVE_LONG_DOUBLE && (SIZEOF_LONG_DOUBLE > SIZEOF_DOUBLE)
-# ifdef __PPC64__
+# ifdef __powerpc__
// PowerPC 64 (when gcc has -mlong-double-128) fails constant folding with LDOUBLE
+ // Debian Bug#946836 shows it is needed also for 32-bit ppc, not just __PPC64__
# define q_1_eps (1 / LDBL_EPSILON)
# else
static LDOUBLE q_1_eps = 1 / LDBL_EPSILON;

View file

@ -1,15 +1,16 @@
# Template file for 'R' # Template file for 'R'
pkgname=R pkgname=R
version=3.6.3 version=4.0.2
revision=2 revision=1
build_style=gnu-configure build_style=gnu-configure
configure_args="--docdir=/usr/share/doc/R rdocdir=/usr/share/doc/R configure_args="--docdir=/usr/share/doc/R rdocdir=/usr/share/doc/R
--with-lapack --with-blas --enable-R-shlib --with-tcltk --with-lapack --with-blas --enable-R-shlib --with-tcltk
--enable-memory-profiling
LIBnn=lib" LIBnn=lib"
hostmakedepends="gcc-fortran pkg-config perl less which" hostmakedepends="gcc-fortran pkg-config perl less which"
makedepends="libgomp-devel readline-devel libXmu-devel libXt-devel makedepends="libgomp-devel readline-devel libXmu-devel libXt-devel
libpng-devel libjpeg-turbo-devel tiff-devel cairo-devel icu-devel libpng-devel libjpeg-turbo-devel tiff-devel cairo-devel icu-devel
lapack-devel blas-devel zlib-devel bzip2-devel pcre-devel liblzma-devel lapack-devel blas-devel zlib-devel bzip2-devel pcre2-devel liblzma-devel
libcurl-devel tcl-devel tk-devel libxml2-devel" libcurl-devel tcl-devel tk-devel libxml2-devel"
depends="xdg-utils less which" depends="xdg-utils less which"
short_desc="System for statistical computation and graphics" short_desc="System for statistical computation and graphics"
@ -17,8 +18,8 @@ maintainer="Florian Wagner <florian@wagner-flo.net>"
license="GPL-2.0-or-later" license="GPL-2.0-or-later"
homepage="https://www.r-project.org/" homepage="https://www.r-project.org/"
changelog="https://cran.r-project.org/doc/manuals/r-release/NEWS.html" changelog="https://cran.r-project.org/doc/manuals/r-release/NEWS.html"
distfiles="https://cran.r-project.org/src/base/R-3/${pkgname}-${version}.tar.gz" distfiles="https://cran.r-project.org/src/base/R-4/${pkgname}-${version}.tar.gz"
checksum=89302990d8e8add536e12125ec591d6951022cf8475861b3690bc8bf1cefaa8f checksum=d3bceab364da0876625e4097808b42512395fdf41292f4915ab1fd257c1bbe75
nocross=yes nocross=yes
shlib_provides="libR.so" shlib_provides="libR.so"