3.1.2

R-3.0.1-arm-compile-fix.patch

@@ -0,0 +1,32 @@
+diff -up R-3.0.1/src/library/tools/R/install.R.armfix R-3.0.1/src/library/tools/R/install.R
+--- R-3.0.1/src/library/tools/R/install.R.armfix	2013-08-12 13:57:17.956790673 -0400
++++ R-3.0.1/src/library/tools/R/install.R	2013-08-12 13:59:51.230800752 -0400
+@@ -108,7 +108,11 @@
+     SHLIB_EXT <- if (WINDOWS) ".dll" else {
+         ## can we do better?
+         mconf <- file.path(R.home(), paste0("etc", rarch), "Makeconf")
+-        sub(".*= ", "", grep("^SHLIB_EXT", readLines(mconf), value = TRUE))
++        if (substr( Sys.info()["machine"], 1, 3) == "arm") { 	# arm has broken regexps in libc
++            sub(".*= ", "", grep("^SHLIB_EXT", readLines(mconf), value = TRUE), perl = TRUE)
++        } else {
++            sub(".*= ", "", grep("^SHLIB_EXT", readLines(mconf), value = TRUE))
++        }
+     }
+ 
+     options(warn = 1)
+@@ -1627,8 +1631,13 @@
+         mconf <- readLines(file.path(R.home(),
+                                      paste0("etc", Sys.getenv("R_ARCH")),
+                                      "Makeconf"))
+-        SHLIB_EXT <- sub(".*= ", "", grep("^SHLIB_EXT", mconf, value = TRUE))
+-        SHLIB_LIBADD <- sub(".*= ", "", grep("^SHLIB_LIBADD", mconf, value = TRUE))
++        if (substr( Sys.info()["machine"], 1, 3) == "arm") { 	# arm has broken regexps in libc
++            SHLIB_EXT <- sub(".*= ", "", grep("^SHLIB_EXT", mconf, value = TRUE), perl = TRUE)
++            SHLIB_LIBADD <- sub(".*= ", "", grep("^SHLIB_LIBADD", mconf, value = TRUE), perl = TRUE)
++        } else {
++            SHLIB_EXT <- sub(".*= ", "", grep("^SHLIB_EXT", mconf, value = TRUE))
++            SHLIB_LIBADD <- sub(".*= ", "", grep("^SHLIB_LIBADD", mconf, value = TRUE))
++        }
+         MAKE <- Sys.getenv("MAKE")
+         rarch <- Sys.getenv("R_ARCH")
+     } else {

R-make-search-index.sh

@@ -1,34 +1,7 @@
 #!/bin/bash
 
-# Determine R versions
-R_SUPER_VERSION=`R --version | grep "R version" | cut -d " " -f 3 | cut -d "." -f 1`
-R_MAJOR_VERSION=`R --version | grep "R version" | cut -d " " -f 3 | cut -d "." -f 2`
-
-# If R 3.0.* ever comes out, we'll need to revisit this logic.
-# Or, just nuke this script and the macros entirely.
-if [ "$R_SUPER_VERSION" -ge "2" -a "$R_MAJOR_VERSION" -ge "10" ]; then
-  # echo "R is new enough to not need this anymore."
-  exit 0
-else
-
-# Figure out what RHOME is set to
-TMP_R_HOME=`R RHOME`
-
-# Figure out what R_DOC_DIR is set to
-# Ideally, we could ask R just like we do for RHOME, but we can't yet.
-TMP_R_DOC_DIR=`grep "R_DOC_DIR=" /usr/bin/R | cut -d "=" -f 2`
-
-# Write out all the contents in arch library locations
-cat $TMP_R_HOME/library/*/CONTENTS > $TMP_R_DOC_DIR/html/search/index.txt 2>/dev/null
-# Don't use .. based paths, substitute TMP_R_HOME
-sed -i "s!../../..!$TMP_R_HOME!g" $TMP_R_DOC_DIR/html/search/index.txt
-
-# Write out all the contents in noarch library locations
-cat /usr/share/R/library/*/CONTENTS >> $TMP_R_DOC_DIR/html/search/index.txt 2>/dev/null
-# Don't use .. based paths, substitute /usr/share/R
-sed -i "s!../../..!/usr/share/R!g" $TMP_R_DOC_DIR/html/search/index.txt
-
-fi
+# This script used to do something, now it doesn't.
+# Why are you reading this?
 
 exit 0
 

sources

@@ -1 +1 @@
-346d16bab26fcae15e53755be8a69b00  R-2.15.2.tar.gz
+3af29ec06704cbd08d4ba8d69250ae74  R-3.1.2.tar.gz