R lang in main
This commit is contained in:
@@ -0,0 +1,2 @@
|
||||
R_HOME_DIR=/usr/lib/R
|
||||
R_HOME=/usr/lib/R
|
||||
@@ -0,0 +1,11 @@
|
||||
--- src/include/Makefile.in.orig 2010-06-15 18:18:54.000000000 +0000
|
||||
+++ src/include/Makefile.in 2010-06-15 18:19:48.000000000 +0000
|
||||
@@ -81,7 +81,7 @@
|
||||
Rmath.h0: $(srcdir)/Rmath.h0.in $(top_builddir)/config.status
|
||||
@cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
|
||||
|
||||
-install: installdirs install-intl-@USE_INCLUDED_LIBINTL@
|
||||
+install: $(OBJ_HEADERS) installdirs install-intl-@USE_INCLUDED_LIBINTL@
|
||||
@for d in $(SUBDIRS); do \
|
||||
(cd $${d} && $(MAKE) $@) || exit 1; \
|
||||
done
|
||||
@@ -0,0 +1,13 @@
|
||||
--- src/main/unzip.h.orig 2011-09-24 19:35:53.000000000 -0700
|
||||
+++ src/main/unzip.h 2011-09-24 19:37:06.000000000 -0700
|
||||
@@ -58,6 +58,10 @@
|
||||
#define ZLIB_FILEFUNC_SEEK_END (2)
|
||||
#define ZLIB_FILEFUNC_SEEK_SET (0)
|
||||
|
||||
+#ifndef OF
|
||||
+#define OF(x) x
|
||||
+#endif
|
||||
+
|
||||
#define ZLIB_FILEFUNC_MODE_READ (1)
|
||||
#define ZLIB_FILEFUNC_MODE_WRITE (2)
|
||||
#define ZLIB_FILEFUNC_MODE_READWRITEFILTER (3)
|
||||
@@ -0,0 +1,12 @@
|
||||
diff -Nuar R-2.7.1.orig/src/unix/Makefile.in R-2.7.1/src/unix/Makefile.in
|
||||
--- R-2.7.1.orig/src/unix/Makefile.in 2008-06-23 12:38:27.000000000 +0300
|
||||
+++ R-2.7.1/src/unix/Makefile.in 2008-06-24 16:40:23.000000000 +0300
|
||||
@@ -66,7 +66,7 @@
|
||||
|
||||
## we need to build at install time to capture the correct 'rhome'
|
||||
install-Rscript:
|
||||
- $(CC) $(ALL_CPPFLAGS) $(ALL_CFLAGS) -DR_HOME='"$(rhome)"' -o Rscript \
|
||||
+ $(CC) $(ALL_CPPFLAGS) $(ALL_CFLAGS) -DR_HOME='"/usr/lib/R/"' -o Rscript \
|
||||
$(srcdir)/Rscript.c
|
||||
@$(MKINSTALLDIRS) "$(DESTDIR)$(Rexecbindir)"
|
||||
@$(INSTALL_PROGRAM) Rscript "$(DESTDIR)$(Rexecbindir)/Rscript"
|
||||
@@ -0,0 +1,43 @@
|
||||
diff -Nuar R-2.12.1.orig//config.site R-2.12.1/config.site
|
||||
--- R-2.12.1.orig//config.site 2010-11-14 01:05:06.000000000 +0200
|
||||
+++ R-2.12.1/config.site 2010-12-22 07:11:10.429000021 +0200
|
||||
@@ -28,7 +28,7 @@
|
||||
## The paper size for the local (PostScript) printer.
|
||||
## It must either be left blank or set to one of 'a4' or 'letter'.
|
||||
## If left blank the system will use 'a4'.
|
||||
-## R_PAPERSIZE=a4
|
||||
+ R_PAPERSIZE=a4
|
||||
|
||||
## Set the default behavior of R when ending a session
|
||||
## Set this to one of '--save' or '--no-save' depending whether you
|
||||
@@ -207,23 +207,26 @@
|
||||
## If unset configure searches in turn for (currently)
|
||||
## firefox mozilla galeon opera xdg-open kfmclient gnome-moz-remote open
|
||||
## and uses the full path.
|
||||
-## R_BROWSER=
|
||||
+R_BROWSER=xdg-open
|
||||
+
|
||||
+## Default pdf viewer
|
||||
+R_PDFVIEWER=xdg-open
|
||||
|
||||
## BLAS and LAPACK settings
|
||||
## Use BLAS_LIBS for all '-L' and '-l' options needed for linking
|
||||
## against an external BLAS implementation.
|
||||
-## BLAS_LIBS=
|
||||
+## BLAS_LIBS=/usr/lib
|
||||
## Use LAPACK_LIBS for all '-L' and '-l' options needed for linking
|
||||
## against an external LAPACK implementation.
|
||||
## Note that (see R-admin) that our main intention is to allow a
|
||||
## LAPACK-containing BLAS to be used, so this is rarely needed, and
|
||||
## it is not used if the BLAS already contains LAPACK.
|
||||
-## LAPACK_LIBS=
|
||||
+## LAPACK_LIBS="-L/usr/lib -llapack -lblas"
|
||||
|
||||
## Make name.
|
||||
## Set this if you want to use a make by another name.
|
||||
## For example, if your GNU make is called 'gmake', use 'MAKE=gmake'.
|
||||
-## MAKE=
|
||||
+MAKE=gmake
|
||||
|
||||
## Tar name
|
||||
## Set this to prefer a tar which has the capability to automagically
|
||||
@@ -0,0 +1,42 @@
|
||||
diff -Nuar R-2.11.0.orig/configure.ac R-2.11.0/configure.ac
|
||||
--- R-2.11.0.orig/configure.ac 2010-04-01 01:10:02.000000000 +0300
|
||||
+++ R-2.11.0/configure.ac 2010-05-02 18:42:50.276871339 +0300
|
||||
@@ -2508,7 +2508,6 @@
|
||||
if test "${acx_blas_ok}" = "yes"; then
|
||||
## Try to figure out which BLAS was used.
|
||||
case "${BLAS_LIBS0}" in
|
||||
- *-latlas*) r_blas=ATLAS ;;
|
||||
*-lsgemm*) r_blas=PhiPack ;;
|
||||
*sunperf*) r_blas=SunPerf ;;
|
||||
*-lessl*) r_blas=ESSL ;;
|
||||
diff -Nuar R-2.11.0.orig/m4/R.m4 R-2.11.0/m4/R.m4
|
||||
--- R-2.11.0.orig/m4/R.m4 2010-03-28 01:10:03.000000000 +0200
|
||||
+++ R-2.11.0/m4/R.m4 2010-05-02 18:44:38.987876278 +0300
|
||||
@@ -2536,19 +2536,6 @@
|
||||
fi
|
||||
fi
|
||||
|
||||
-## BLAS linked to by default? (happens on some supercomputers)
|
||||
-if test "${acx_blas_ok}" = no; then
|
||||
- AC_CHECK_FUNC(${dgemm}, [acx_blas_ok=yes])
|
||||
-fi
|
||||
-
|
||||
-## BLAS in ATLAS library? (http://math-atlas.sourceforge.net/)
|
||||
-if test "${acx_blas_ok}" = no; then
|
||||
- AC_CHECK_LIB(atlas, ATL_xerbla,
|
||||
- [AC_CHECK_LIB(f77blas, ${dgemm},
|
||||
- [acx_blas_ok=yes
|
||||
- BLAS_LIBS="-lf77blas -latlas"],
|
||||
- [], [-latlas])])
|
||||
-fi
|
||||
|
||||
## BLAS in PhiPACK libraries? (requires generic BLAS lib, too)
|
||||
if test "${acx_blas_ok}" = no; then
|
||||
@@ -2744,7 +2731,6 @@
|
||||
F77_SYMBOL(drotmg)();
|
||||
F77_SYMBOL(dsbmv)();
|
||||
F77_SYMBOL(dscal)();
|
||||
- F77_SYMBOL(dsdot)();
|
||||
F77_SYMBOL(dspmv)();
|
||||
F77_SYMBOL(dspr)();
|
||||
F77_SYMBOL(dspr2)();
|
||||
@@ -0,0 +1 @@
|
||||
/usr/lib/R/lib
|
||||
@@ -0,0 +1,31 @@
|
||||
diff -Nuar R-3.0.1.orig/configure.ac R-3.0.1/configure.ac
|
||||
--- R-3.0.1.orig/configure.ac 2013-03-25 01:05:05.000000000 +0200
|
||||
+++ R-3.0.1/configure.ac 2013-05-18 23:41:55.803629789 +0300
|
||||
@@ -137,7 +137,7 @@
|
||||
linux*)
|
||||
## Not all distros use this: some choose to march out of step
|
||||
case "${host_cpu}" in
|
||||
- x86_64|mips64|ppc64|powerpc64|sparc64|s390x)
|
||||
+ mips64|ppc64|powerpc64|sparc64|s390x)
|
||||
if test -d /usr/lib64; then
|
||||
libnn=lib64
|
||||
fi
|
||||
diff -Nuar R-3.0.1.orig/src/scripts/R.sh.in R-3.0.1/src/scripts/R.sh.in
|
||||
--- R-3.0.1.orig/src/scripts/R.sh.in 2013-03-06 01:02:41.000000000 +0200
|
||||
+++ R-3.0.1/src/scripts/R.sh.in 2013-05-18 23:42:28.075630689 +0300
|
||||
@@ -7,13 +7,13 @@
|
||||
linux*)
|
||||
run_arch=`uname -m`
|
||||
case "$run_arch" in
|
||||
- x86_64|mips64|ppc64|powerpc64|sparc64|s390x)
|
||||
+ mips64|ppc64|powerpc64|sparc64|s390x)
|
||||
libnn=lib64
|
||||
libnn_fallback=lib
|
||||
;;
|
||||
*)
|
||||
libnn=lib
|
||||
- libnn_fallback=lib64
|
||||
+ libnn_fallback=lib
|
||||
;;
|
||||
esac
|
||||
if [ -x "@prefix@/${libnn}/R/bin/exec/R" ]; then
|
||||
Reference in New Issue
Block a user