SF.net SVN: gar:[26631] csw/mgar/pkg/r/trunk

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Mon Apr 27 22:47:45 CEST 2020


Revision: 26631
          http://sourceforge.net/p/gar/code/26631
Author:   dmichelsen
Date:     2020-04-27 20:47:45 +0000 (Mon, 27 Apr 2020)
Log Message:
-----------
r/trunk: Update to 4.0.0

Modified Paths:
--------------
    csw/mgar/pkg/r/trunk/Makefile
    csw/mgar/pkg/r/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/r/trunk/files/0000-Solaris-does-not-have-a-good-utimensat.patch

Modified: csw/mgar/pkg/r/trunk/Makefile
===================================================================
--- csw/mgar/pkg/r/trunk/Makefile	2020-04-26 15:55:46 UTC (rev 26630)
+++ csw/mgar/pkg/r/trunk/Makefile	2020-04-27 20:47:45 UTC (rev 26631)
@@ -2,22 +2,24 @@
 # Only builds on Solaris 10
 
 NAME = R
-VERSION = 3.3.0
+VERSION = 4.0.0
 GARTYPE = v2
 
 DESCRIPTION = A language and environment for statistical computing and graphics
 
 MASTER_SITES = http://stat.ethz.ch/CRAN/src/base/R-$(shell echo $(VERSION) | awk -F. '{print $$1}')/
-DISTFILES    = $(NAME)-$(VERSION).tar.gz
+DISTFILES += $(NAME)-$(VERSION).tar.gz
 
-PACKAGES       = CSWr-base
 VENDOR_URL     = http://www.r-project.org/
 
+BUILD_DEP_PKGS += CSWadobereader
+
+PACKAGES += CSWr-base
 RUNTIME_DEP_PKGS_CSWr-base += CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWr-base += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWr-base += CSWlibintl9
 RUNTIME_DEP_PKGS_CSWr-base += CSWlibjpeg7
 RUNTIME_DEP_PKGS_CSWr-base += CSWliblzma5
-RUNTIME_DEP_PKGS_CSWr-base += CSWlibreadline6
+RUNTIME_DEP_PKGS_CSWr-base += CSWlibreadline7
 RUNTIME_DEP_PKGS_CSWr-base += CSWlibtiff5
 RUNTIME_DEP_PKGS_CSWr-base += CSWlibz1
 RUNTIME_DEP_PKGS_CSWr-base += CSWsunmath
@@ -32,22 +34,41 @@
 RUNTIME_DEP_PKGS_CSWr-base += CSWlibpangocairo1-0-0
 RUNTIME_DEP_PKGS_CSWr-base += CSWlibgfortran3
 RUNTIME_DEP_PKGS_CSWr-base += CSWlibbz2-1-0
-RUNTIME_DEP_PKGS_CSWr-base += CSWlibpcre1
+RUNTIME_DEP_PKGS_CSWr-base += CSWlibpcre2-8-0
 RUNTIME_DEP_PKGS_CSWr-base += CSWlibcurl4
 RUNTIME_DEP_PKGS_CSWr-base += CSWlibpng16-16
-RUNTIME_DEP_PKGS_CSWr-base += CSWlibicui18n56
-RUNTIME_DEP_PKGS_CSWr-base += CSWlibicuuc56
-#Needed to install addons
+RUNTIME_DEP_PKGS_CSWr-base += CSWlibicui18n57
+RUNTIME_DEP_PKGS_CSWr-base += CSWlibicuuc57
+RUNTIME_DEP_PKGS_CSWr-base += CSWlibpsl5
+RUNTIME_DEP_PKGS_CSWr-base += CSWlibkrb5-3
+RUNTIME_DEP_PKGS_CSWr-base += CSWlibssh2-1
+RUNTIME_DEP_PKGS_CSWr-base += CSWlibrtmp0
+RUNTIME_DEP_PKGS_CSWr-base += CSWlibldap2-4-2
+RUNTIME_DEP_PKGS_CSWr-base += CSWlibssl1-0-0
+RUNTIME_DEP_PKGS_CSWr-base += CSWlibidn2-0
+RUNTIME_DEP_PKGS_CSWr-base += CSWliblber2-4-2
+RUNTIME_DEP_PKGS_CSWr-base += CSWlibcom-err3
+RUNTIME_DEP_PKGS_CSWr-base += CSWlibnghttp2-14
+RUNTIME_DEP_PKGS_CSWr-base += CSWlibbrotlidec1
+RUNTIME_DEP_PKGS_CSWr-base += CSWlibcares2
+RUNTIME_DEP_PKGS_CSWr-base += CSWlibk5crypto3
+
+# Needed to install addons
 RUNTIME_DEP_PKGS_CSWr-base += CSWgcc5g++
 CHECKPKG_OVERRIDES_CSWr-base += surplus-dependency|CSWgcc5g++
 
 # These are because of linker anomaly
-CHECKPKG_OVERRIDES_CSWr-base += surplus-dependency|CSWlibz1
-CHECKPKG_OVERRIDES_CSWr-base += surplus-dependency|CSWlibglib2-0-0
+CHECKPKG_OVERRIDES_CSWr-base-sparc += surplus-dependency|CSWlibz1
+CHECKPKG_OVERRIDES_CSWr-base-sparc += surplus-dependency|CSWlibglib2-0-0
 
+# This is x86 only
+RUNTIME_DEP_PKGS_CSWr-base-i386  += CSWlibquadmath0
+
+CHECKPKG_OVERRIDES_CSWr-base += $(CHECKPKG_OVERRIDES_CSWr-base-$(GARCH))
+
 # Temporary overrides
 CHECKPKG_OVERRIDES_CSWr-base += file-with-bad-content
-CHECKPKG_OVERRIDES_CSWr-base += bad-rpath-entry
+#CHECKPKG_OVERRIDES_CSWr-base += bad-rpath-entry
 
 # There is a special wrapper that takes care of finding the sonames.
 CHECKPKG_OVERRIDES_CSWr-base += soname-not-found|libRblas.so|is|needed|by|opt/csw/lib/R/bin/exec/R
@@ -86,14 +107,31 @@
 
 GARCOMPILER = GNU
 
+# internet.so needs libnsl.so and libsocket.so which are linked against the "r" binary, but
+# not internet.so. Skipping directly unneeded libraries leads to these errors:
+#   https://www.opencsw.org/mantis/view.php?id=5176
+#   https://bugs.r-project.org/bugzilla/show_bug.cgi?id=15815
+LINKER_IGNORE =
+
 BUILD64 = 1
 
-CONFIGURE_ARGS = $(DIRPATHS)
+# We need 'grep -E'
+CONFIGURE_ENV_PATH = /opt/csw/gnu:$(PATH)
 
+CONFIGURE_ARGS += $(DIRPATHS)
+CONFIGURE_ARGS += --with-internal-tzcode
+
 TEST_TARGET = check-recommended
 
+PATCHFILES += 0000-Solaris-does-not-have-a-good-utimensat.patch
+
 INTERNET_LIBS = -lsocket -lnsl
+EXTRA_COMMON_EXPORTS += INTERNET_LIBS
 
-EXTRA_COMMON_EXPORTS = INTERNET_LIBS
+# This is buildfarm-specific and should probably be a global setting
+http_proxy = http://proxy:3128
+https_proxy = http://proxy:3128
+EXTRA_COMMON_EXPORTS += http_proxy
+EXTRA_COMMON_EXPORTS += https_proxy
 
 include gar/category.mk

Modified: csw/mgar/pkg/r/trunk/checksums
===================================================================
--- csw/mgar/pkg/r/trunk/checksums	2020-04-26 15:55:46 UTC (rev 26630)
+++ csw/mgar/pkg/r/trunk/checksums	2020-04-27 20:47:45 UTC (rev 26631)
@@ -1 +1 @@
-5a7506c8813432d1621c9725e86baf7a  R-3.3.0.tar.gz
+48c487c68112cb3191f3015c6277a50b  R-4.0.0.tar.gz

Added: csw/mgar/pkg/r/trunk/files/0000-Solaris-does-not-have-a-good-utimensat.patch
===================================================================
--- csw/mgar/pkg/r/trunk/files/0000-Solaris-does-not-have-a-good-utimensat.patch	                        (rev 0)
+++ csw/mgar/pkg/r/trunk/files/0000-Solaris-does-not-have-a-good-utimensat.patch	2020-04-27 20:47:45 UTC (rev 26631)
@@ -0,0 +1,27 @@
+From 7beb847809276ab94b62ed43c75a20f35b19ed6c Mon Sep 17 00:00:00 2001
+From: Gabor Csardi <csardi.gabor at gmail.com>
+Date: Fri, 24 Apr 2020 15:21:47 +0100
+Subject: [PATCH] Solaris does not have a good utimensat
+
+---
+ src/main/platform.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/main/platform.c b/src/main/platform.c
+index 726af2e..5d4bf1f 100644
+--- a/src/main/platform.c
++++ b/src/main/platform.c
+@@ -2500,6 +2500,10 @@ SEXP attribute_hidden do_filecopy(SEXP call, SEXP op, SEXP args, SEXP rho)
+ # undef HAVE_UTIMENSAT
+ #endif
+ 
++#if defined(__sun)
++# undef HAVE_UTIMENSAT
++#endif
++
+ #if defined(HAVE_UTIMENSAT)
+ # include <fcntl.h>
+ # include <sys/stat.h>
+-- 
+2.3.1
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.



More information about the devel mailing list