Ticket #9668: trac_9668-r.v2.patch

SPKG.txt

@@ -38 +38 @@
    - R.sh.in: Set R_HOME_DIR to "${SAGE_LOCAL}/lib/R/" when running R.
    - install_parallel.patch: fix parallel installation, see
      https://bugs.r-project.org/bugzilla3/show_bug.cgi?id=15041
+   - Makefile.in.patch: set R_HOME_DIR to $SAGE_LOCAL/bin/R:
+     $SAGE_LOCAL remains unevaluated. This should make R behave better
+     after relocating the Sage installation. Also don't put in
+     hard-coded paths for R_SHARE_DIR, etc.: just use
+     $R_HOME_DIR/share.
 
 == Changelog ==
 
+=== r-2.14.0.p7 (John H. Palmieri, 31 January 2013) ===
+ * #9668: don't hardcode absolute paths in various components
+   of R. So configure with prefix='\$SAGE_LOCAL' instead of
+   "$SAGE_LOCAL", and modify src/scripts/Makefile.in.
+
 === r-2.14.0.p6 (Jeroen Demeyer, 10 September 2012) ===
  * #13443: some clean up of spkg-install.
  * Compile R with optimization (at -O2 level).

new file patches/Makefile.in.patch

@@ +1 @@
+--- src/src/scripts/Makefile.in 2011-03-15 16:02:42.000000000 -0700
++++ src.new/src/scripts/Makefile.in     2013-01-31 14:21:16.000000000 -0800
+@@ -73,8 +73,7 @@
+          dat=`sed -e 1d -e 's/^Last Changed Date: //' $(top_builddir)/SVN-REVISION`; \
+          v="$${v} ($${dat})"; \
+          y=`$(ECHO) $${dat} | cut -d- -f1`; \
+-         d=`$(ECHO) "$(abs_top_builddir)" | sed 's,/,\\\/,g'`; \
+-         sed "1,/R_HOME_DIR/s/\\(R_HOME_DIR=\\).*/\\1\"$${d}\"/; \
++         sed "1,/R_HOME_DIR/s/\\(R_HOME_DIR=\\).*/\\1\"\$$SAGE_LOCAL\/bin\/R\"/; \
+               s@REPLACE_BY_VERSION@$${v}@; \
+               s@REPLACE_BY_YEAR@$${y}@" < R.sh > $@)
+        @chmod +x $@
+@@ -85,8 +84,7 @@
+ 
+ install: installdirs install-cmds
+        @rm -f $(DESTDIR)$(bindir)/R
+-       @(d=`$(ECHO) '$(rhome)' | sed 's,/,\\\/,g';`; \
+-         sed -e "1,/R_HOME_DIR=/s/\\(R_HOME_DIR=\\).*/\\1$${d}/;" -e "s+\\(R_SHARE_DIR=\\).*+\\1$(rsharedir)+;" -e  "s+\\(R_INCLUDE_DIR=\\).*+\\1$(rincludedir)+;" -e "s+\\(R_DOC_DIR=\\).*+\\1$(rdocdir)+;"\
++       @(sed -e "1,/R_HOME_DIR=/s/\\(R_HOME_DIR=\\).*/\\1\\$SAGE_LOCAL/lib/R/;"\
+          < R.fe > "$(DESTDIR)$(Rexecbindir)/R")
+        @$(INSTALL_SCRIPT)  "$(DESTDIR)$(Rexecbindir)/R" "$(DESTDIR)$(bindir)/R"
+        @chmod 755 "$(DESTDIR)$(bindir)/R" "$(DESTDIR)$(Rexecbindir)/R"

spkg-install

@@ -105 +105 @@
 
 if [ "$UNAME" = "Darwin" ]; then
     echo "Configuring R without ATLAS for OS X"
-    ./configure --prefix="$SAGE_LOCAL" --libdir="$SAGE_LOCAL/lib" $R_CONFIGURE \
-        --with-readline="$SAGE_LOCAL"
+    ./configure --prefix="\$SAGE_LOCAL" --libdir="$SAGE_LOCAL/lib" $R_CONFIGURE \
+        --with-readline="\$SAGE_LOCAL"
 else
     echo "Configuring R with ATLAS"
-    ./configure --prefix="$SAGE_LOCAL" --libdir="$SAGE_LOCAL/lib" $R_CONFIGURE \
+    ./configure --prefix="\$SAGE_LOCAL" --libdir="$SAGE_LOCAL/lib" $R_CONFIGURE \
         --with-readline="$SAGE_LOCAL" \
         --with-blas="-L$SAGE_LOCAL/lib -lf77blas -latlas" \
         --with-lapack="-L$SAGE_LOCAL/lib -llapack -lcblas"
@@ -118 +118 @@
 if [ $? -ne 0 ]; then
     echo "Configuring R with fallback options"
     R_CONFIGURE=`echo "$R_CONFIGURE" | sed 's/--with-x=yes/--with-x=no/' `
-    ./configure --prefix="$SAGE_LOCAL" --libdir="$SAGE_LOCAL/lib" $R_CONFIGURE \
+    ./configure --prefix="\$SAGE_LOCAL" --libdir="$SAGE_LOCAL/lib" $R_CONFIGURE \
         --with-readline="$SAGE_LOCAL"
 fi