Index: ports/r/nacl.patch |
diff --git a/ports/r/nacl.patch b/ports/r/nacl.patch |
new file mode 100644 |
index 0000000000000000000000000000000000000000..6046008942f1ad1d816f9c4206414535d635ed12 |
--- /dev/null |
+++ b/ports/r/nacl.patch |
@@ -0,0 +1,396 @@ |
+diff --git a/configure b/configure |
+index adab221..f925f57 100755 |
+--- a/configure |
++++ b/configure |
+@@ -9547,7 +9547,8 @@ irix5* | irix6* | nonstopux*) |
+ ;; |
+ |
+ # This must be Linux ELF. |
+-linux* | k*bsd*-gnu) |
++# Patched by naclports using patch_configure.py |
++linux* | k*bsd*-gnu | nacl*) |
+ lt_cv_deplibs_check_method=pass_all |
+ ;; |
+ |
+@@ -14374,6 +14375,18 @@ uts4*) |
+ shlibpath_var=LD_LIBRARY_PATH |
+ ;; |
+ |
++nacl) |
++ # Patched by naclports using patch_configure.py |
++ if libc_so=`$CC -print-file-name=libc.so` && [ "$libc_so" != libc.so ]; then |
++ dynamic_linker="GNU/NaCl ld.so" |
++ version_type=linux |
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' |
++ soname_spec='${libname}${release}${shared_ext}$major' |
++ else |
++ dynamic_linker=no |
++ fi |
++ ;; |
++ |
+ *) |
+ dynamic_linker=no |
+ ;; |
+@@ -17820,6 +17833,18 @@ uts4*) |
+ shlibpath_var=LD_LIBRARY_PATH |
+ ;; |
+ |
++nacl) |
++ # Patched by naclports using patch_configure.py |
++ if libc_so=`$CC -print-file-name=libc.so` && [ "$libc_so" != libc.so ]; then |
++ dynamic_linker="GNU/NaCl ld.so" |
++ version_type=linux |
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' |
++ soname_spec='${libname}${release}${shared_ext}$major' |
++ else |
++ dynamic_linker=no |
++ fi |
++ ;; |
++ |
+ *) |
+ dynamic_linker=no |
+ ;; |
+@@ -20292,6 +20317,18 @@ uts4*) |
+ shlibpath_var=LD_LIBRARY_PATH |
+ ;; |
+ |
++nacl) |
++ # Patched by naclports using patch_configure.py |
++ if libc_so=`$CC -print-file-name=libc.so` && [ "$libc_so" != libc.so ]; then |
++ dynamic_linker="GNU/NaCl ld.so" |
++ version_type=linux |
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' |
++ soname_spec='${libname}${release}${shared_ext}$major' |
++ else |
++ dynamic_linker=no |
++ fi |
++ ;; |
++ |
+ *) |
+ dynamic_linker=no |
+ ;; |
+@@ -20896,7 +20933,7 @@ fi |
+ done |
+ |
+ r_save_LIBS="${LIBS}" |
+- LIBS= |
++# LIBS= |
+ ## don't use the cached value as we need to rebuild LIBS |
+ unset ac_cv_lib_readline_rl_callback_read_char |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_callback_read_char in -lreadline" >&5 |
+@@ -23603,6 +23640,7 @@ for arg in ${FLIBS}; do |
+ done |
+ FLIBS="${flibs}" |
+ fi |
++FLIBS=-lgfortran |
+ |
+ if test -z "$FLIBS_IN_SO"; then |
+ FLIBS_IN_SO=${FLIBS} |
+@@ -23619,7 +23657,7 @@ if ${ac_cv_f77_dummy_main+:} false; then : |
+ $as_echo_n "(cached) " >&6 |
+ else |
+ ac_f77_dm_save_LIBS=$LIBS |
+- LIBS="$LIBS $FLIBS" |
++ LIBS="$FLIBS $LIBS" |
+ ac_fortran_dm_var=F77_DUMMY_MAIN |
+ ac_ext=c |
+ ac_cpp='$CPP $CPPFLAGS' |
+@@ -38391,6 +38429,18 @@ uts4*) |
+ shlibpath_var=LD_LIBRARY_PATH |
+ ;; |
+ |
++nacl) |
++ # Patched by naclports using patch_configure.py |
++ if libc_so=`$CC -print-file-name=libc.so` && [ "$libc_so" != libc.so ]; then |
++ dynamic_linker="GNU/NaCl ld.so" |
++ version_type=linux |
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' |
++ soname_spec='${libname}${release}${shared_ext}$major' |
++ else |
++ dynamic_linker=no |
++ fi |
++ ;; |
++ |
+ *) |
+ dynamic_linker=no |
+ ;; |
+diff --git a/src/include/Defn.h b/src/include/Defn.h |
+index 6806957..ae813bc 100644 |
+--- a/src/include/Defn.h |
++++ b/src/include/Defn.h |
+@@ -194,6 +194,9 @@ extern void R_WaitEvent(void); |
+ # include <limits.h> |
+ #endif |
+ |
++#if defined(__native_client__) |
++# define HAVE_DECL_SIZE_MAX 1 |
++#endif |
+ #if defined HAVE_DECL_SIZE_MAX && HAVE_DECL_SIZE_MAX |
+ typedef size_t R_size_t; |
+ # define R_SIZE_T_MAX SIZE_MAX |
+diff --git a/src/library/Makefile.in b/src/library/Makefile.in |
+index 0fc2c27..43e918f 100644 |
+--- a/src/library/Makefile.in |
++++ b/src/library/Makefile.in |
+@@ -15,7 +15,8 @@ DISTFILES = Makefile.in Makefile.win |
+ |
+ SUBDIRS = profile $(R_PKGS_BASE) translations Recommended |
+ |
+-R_EXE = $(top_builddir)/bin/R --vanilla --slave |
++#R_EXE = $(top_builddir)/bin/R --vanilla --slave |
++R_EXE = R --vanilla --slave |
+ |
+ .SUFFIXES: .inn .Rdts .Rdh |
+ |
+@@ -38,7 +39,7 @@ R: |
+ (cd $${pkg} && $(MAKE) all) || exit 1; \ |
+ done |
+ @if test -z "$(R_NO_BASE_COMPILE)"; then \ |
+- for pkg in base tools; do \ |
++ for pkg in tools; do \ |
+ (cd $${pkg} && $(MAKE) mklazycomp) || exit 1; \ |
+ done; \ |
+ else \ |
+@@ -49,7 +50,7 @@ R: |
+ @for pkg in $(R_PKGS_BASE1); do \ |
+ (cd $${pkg} && $(MAKE) all) || exit 1; \ |
+ done |
+- @(cd base && $(MAKE) mkdesc) |
++ #@(cd base && $(MAKE) mkdesc) |
+ @$(ECHO) "tools:::.vinstall_package_descriptions_as_RDS(\"$(top_builddir)/library\", \"$(R_PKGS_BASE)\")" | \ |
+ R_DEFAULT_PACKAGES=tools LC_ALL=C $(R_EXE) > /dev/null |
+ @$(ECHO) "installing parsed NAMESPACE files" |
+diff --git a/src/library/base/Makefile.in b/src/library/base/Makefile.in |
+index 87e706f..d574324 100644 |
+--- a/src/library/base/Makefile.in |
++++ b/src/library/base/Makefile.in |
+@@ -17,7 +17,8 @@ pkg = base |
+ |
+ RSRC = `LC_COLLATE=C ls $(srcdir)/R/*.R $(srcdir)/R/$(R_OSTYPE)/*.R` |
+ |
+-R_EXE = $(top_builddir)/bin/R --vanilla --slave |
++#R_EXE = $(top_builddir)/bin/R --vanilla --slave |
++R_EXE = R --vanilla --slave |
+ |
+ ## For people who do make -C ../src/library/base |
+ update: |
+diff --git a/src/library/compiler/Makefile.in b/src/library/compiler/Makefile.in |
+index 18fe856..17a2110 100644 |
+--- a/src/library/compiler/Makefile.in |
++++ b/src/library/compiler/Makefile.in |
+@@ -15,7 +15,8 @@ DISTFILES = DESCRIPTION.in Makefile.in Makefile.win NAMESPACE |
+ |
+ pkg = compiler |
+ |
+-R_EXE = $(top_builddir)/bin/R --vanilla --slave |
++#R_EXE = $(top_builddir)/bin/R --vanilla --slave |
++R_EXE = R --vanilla --slave |
+ |
+ RSRC = `LC_COLLATE=C ls $(srcdir)/R/*.R` |
+ DEFPKGS = NULL |
+diff --git a/src/library/datasets/Makefile.in b/src/library/datasets/Makefile.in |
+index 8f12675..440da1c 100644 |
+--- a/src/library/datasets/Makefile.in |
++++ b/src/library/datasets/Makefile.in |
+@@ -15,7 +15,8 @@ DISTFILES = DESCRIPTION.in Makefile.in Makefile.win NAMESPACE |
+ |
+ pkg = datasets |
+ |
+-R_EXE = $(top_builddir)/bin/R --vanilla --slave |
++#R_EXE = $(top_builddir)/bin/R --vanilla --slave |
++R_EXE = R --vanilla --slave |
+ |
+ all: Makefile DESCRIPTION |
+ @$(ECHO) "building package '$(pkg)'" |
+@@ -26,8 +27,8 @@ all: Makefile DESCRIPTION |
+ $(INSTALL_DATA) $${f} $(top_builddir)/library/$(pkg)/data; \ |
+ done |
+ @rm -f $(top_builddir)/library/$(pkg)/data/Rdata.* |
+- @$(ECHO) "tools:::data2LazyLoadDB(\"$(pkg)\", compress=3)" | \ |
+- R_DEFAULT_PACKAGES=NULL LC_ALL=C $(R_EXE) > /dev/null |
++ #@$(ECHO) "tools:::data2LazyLoadDB(\"$(pkg)\", compress=3)" | \ |
++ # R_DEFAULT_PACKAGES=NULL LC_ALL=C $(R_EXE) > /dev/null |
+ @$(INSTALL_DATA) $(srcdir)/data/morley.tab \ |
+ $(top_builddir)/library/$(pkg)/data |
+ |
+diff --git a/src/library/grDevices/Makefile.in b/src/library/grDevices/Makefile.in |
+index 12a3650..3aef427 100644 |
+--- a/src/library/grDevices/Makefile.in |
++++ b/src/library/grDevices/Makefile.in |
+@@ -14,7 +14,8 @@ include $(top_builddir)/Makeconf |
+ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) |
+ DISTFILES = DESCRIPTION.in Makefile.in Makefile.win NAMESPACE |
+ |
+-R_EXE = $(top_builddir)/bin/R --vanilla --slave |
++#R_EXE = $(top_builddir)/bin/R --vanilla --slave |
++R_EXE = R --vanilla --slave |
+ |
+ RSRC = `LC_COLLATE=C ls $(srcdir)/R/*.R $(srcdir)/R/$(R_OSTYPE)/*.R` |
+ INSTDIRS = afm enc icc |
+diff --git a/src/library/graphics/Makefile.in b/src/library/graphics/Makefile.in |
+index 052730e..0ba36d4 100644 |
+--- a/src/library/graphics/Makefile.in |
++++ b/src/library/graphics/Makefile.in |
+@@ -14,7 +14,8 @@ include $(top_builddir)/Makeconf |
+ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) |
+ DISTFILES = DESCRIPTION.in Makefile.in Makefile.win NAMESPACE |
+ |
+-R_EXE = $(top_builddir)/bin/R --vanilla --slave |
++#R_EXE = $(top_builddir)/bin/R --vanilla --slave |
++R_EXE = R --vanilla --slave |
+ |
+ RSRC = `LC_COLLATE=C ls $(srcdir)/R/*.R` |
+ DEFPKGS = NULL |
+diff --git a/src/library/grid/Makefile.in b/src/library/grid/Makefile.in |
+index 977266b..2f6df96 100644 |
+--- a/src/library/grid/Makefile.in |
++++ b/src/library/grid/Makefile.in |
+@@ -18,7 +18,8 @@ pkg = grid |
+ RSRC = `LC_COLLATE=C ls $(srcdir)/R/*.R` |
+ INSTDIRS = doc |
+ |
+-R_EXE = $(top_builddir)/bin/R --vanilla --slave |
++#R_EXE = $(top_builddir)/bin/R --vanilla --slave |
++R_EXE = R --vanilla --slave |
+ DEFPKGS = NULL |
+ |
+ all: Makefile DESCRIPTION |
+diff --git a/src/library/methods/Makefile.in b/src/library/methods/Makefile.in |
+index 256fddc..96ff731 100644 |
+--- a/src/library/methods/Makefile.in |
++++ b/src/library/methods/Makefile.in |
+@@ -16,7 +16,8 @@ pkg = methods |
+ |
+ RSRC = `LC_COLLATE=C ls $(srcdir)/R/*.R` |
+ |
+-R_EXE = $(top_builddir)/bin/R --vanilla --slave |
++#R_EXE = $(top_builddir)/bin/R --vanilla --slave |
++R_EXE = R --vanilla --slave |
+ EXTRAS = @BYTE_COMPILE_PACKAGES_TRUE@ R_COMPILE_PKGS=1 R_COMPILER_SUPPRESS_ALL=1 |
+ |
+ all: Makefile DESCRIPTION |
+diff --git a/src/library/parallel/Makefile.in b/src/library/parallel/Makefile.in |
+index 1e5e9a1..6fba37e 100644 |
+--- a/src/library/parallel/Makefile.in |
++++ b/src/library/parallel/Makefile.in |
+@@ -18,7 +18,8 @@ pkg = parallel |
+ RSRC = `LC_COLLATE=C ls $(srcdir)/R/*.R $(srcdir)/R/$(R_OSTYPE)/*.R` |
+ INSTDIRS = doc |
+ |
+-R_EXE = $(top_builddir)/bin/R --vanilla --slave |
++#R_EXE = $(top_builddir)/bin/R --vanilla --slave |
++R_EXE = R --vanilla --slave |
+ DEFPKGS = NULL |
+ |
+ all: Makefile DESCRIPTION |
+diff --git a/src/library/parallel/src/fork.c b/src/library/parallel/src/fork.c |
+index 551fbc7..4ddb7dc 100644 |
+--- a/src/library/parallel/src/fork.c |
++++ b/src/library/parallel/src/fork.c |
+@@ -228,7 +228,9 @@ static void setup_sig_handler() { |
+ /* sigaction is not viable, so use the "dumb" way |
+ to clean up anything that comes our way */ |
+ static void setup_sig_handler() { |
++#if !defined(__native_client__) |
+ signal(SIGCHLD, parent_sig_handler); |
++#endif |
+ } |
+ |
+ static void parent_sig_handler(int sig) { |
+diff --git a/src/library/splines/Makefile.in b/src/library/splines/Makefile.in |
+index 8e1eeb5..9cbc40a 100644 |
+--- a/src/library/splines/Makefile.in |
++++ b/src/library/splines/Makefile.in |
+@@ -18,7 +18,8 @@ pkg = splines |
+ |
+ RSRC = `LC_COLLATE=C ls $(srcdir)/R/*.R` |
+ |
+-R_EXE = $(top_builddir)/bin/R --vanilla --slave |
++#R_EXE = $(top_builddir)/bin/R --vanilla --slave |
++R_EXE = R --vanilla --slave |
+ DEFPKGS = NULL |
+ |
+ all: Makefile DESCRIPTION |
+diff --git a/src/library/stats/Makefile.in b/src/library/stats/Makefile.in |
+index 38bcdb8..b16ab24 100644 |
+--- a/src/library/stats/Makefile.in |
++++ b/src/library/stats/Makefile.in |
+@@ -18,7 +18,8 @@ pkg = stats |
+ |
+ FRONTFILES = COPYRIGHTS.modreg SOURCES.ts |
+ |
+-R_EXE = $(top_builddir)/bin/R --vanilla --slave |
++#R_EXE = $(top_builddir)/bin/R --vanilla --slave |
++R_EXE = R --vanilla --slave |
+ |
+ RSRC = `LC_COLLATE=C ls $(srcdir)/R/*.R` |
+ DEFPKGS = NULL |
+diff --git a/src/library/stats4/Makefile.in b/src/library/stats4/Makefile.in |
+index f995992..599a260 100644 |
+--- a/src/library/stats4/Makefile.in |
++++ b/src/library/stats4/Makefile.in |
+@@ -15,7 +15,8 @@ DISTFILES = DESCRIPTION.in Makefile.in Makefile.win NAMESPACE |
+ |
+ pkg = stats4 |
+ |
+-R_EXE = $(top_builddir)/bin/R --vanilla --slave |
++#R_EXE = $(top_builddir)/bin/R --vanilla --slave |
++R_EXE = R --vanilla --slave |
+ DEFPKGS = "methods,graphics,stats" |
+ |
+ all: Makefile DESCRIPTION |
+diff --git a/src/library/tcltk/Makefile.in b/src/library/tcltk/Makefile.in |
+index ee983ff..bb01f29 100644 |
+--- a/src/library/tcltk/Makefile.in |
++++ b/src/library/tcltk/Makefile.in |
+@@ -15,7 +15,8 @@ DISTFILES = DESCRIPTION.in Makefile.in Makefile.win NAMESPACE |
+ |
+ pkg = tcltk |
+ |
+-R_EXE = $(top_builddir)/bin/R --vanilla --slave |
++#R_EXE = $(top_builddir)/bin/R --vanilla --slave |
++R_EXE = R --vanilla --slave |
+ |
+ RSRC = `LC_COLLATE=C ls $(srcdir)/R/*.R $(srcdir)/R/$(R_OSTYPE)/zzz.R` |
+ DEFPKGS = NULL |
+diff --git a/src/library/tools/Makefile.in b/src/library/tools/Makefile.in |
+index fcbd3eb..5081f20 100644 |
+--- a/src/library/tools/Makefile.in |
++++ b/src/library/tools/Makefile.in |
+@@ -17,7 +17,8 @@ pkg = tools |
+ |
+ RSRC = `LC_COLLATE=C ls $(srcdir)/R/*.R` |
+ |
+-R_EXE = $(top_builddir)/bin/R --vanilla --slave |
++#R_EXE = $(top_builddir)/bin/R --vanilla --slave |
++R_EXE = R --vanilla --slave |
+ |
+ ## For people who do make -C ../src/library/tools |
+ update: |
+diff --git a/src/library/utils/Makefile.in b/src/library/utils/Makefile.in |
+index a15cd28..8890014 100644 |
+--- a/src/library/utils/Makefile.in |
++++ b/src/library/utils/Makefile.in |
+@@ -15,7 +15,8 @@ DISTFILES = DESCRIPTION.in Makefile.in Makefile.win NAMESPACE |
+ |
+ pkg = utils |
+ |
+-R_EXE = $(top_builddir)/bin/R --vanilla --slave |
++#R_EXE = $(top_builddir)/bin/R --vanilla --slave |
++R_EXE = R --vanilla --slave |
+ |
+ RSRC = `LC_COLLATE=C ls $(srcdir)/R/*.R $(srcdir)/R/$(R_OSTYPE)/*.R` |
+ INSTDIRS = Sweave doc misc |
+diff --git a/src/unix/Makefile.in b/src/unix/Makefile.in |
+index e77ad01..6690f28 100644 |
+--- a/src/unix/Makefile.in |
++++ b/src/unix/Makefile.in |
+@@ -65,7 +65,7 @@ maintainer-clean: distclean |
+ ## we need to build at install time to capture the correct 'rhome' |
+ install-Rscript: |
+ $(CC) $(ALL_CPPFLAGS) $(ALL_CFLAGS) $(LDFLAGS) -DR_HOME='"$(rhome)"' \ |
+- -o Rscript $(srcdir)/Rscript.c |
++ -o Rscript $(srcdir)/Rscript.c $(LIBS) |
+ @$(MKINSTALLDIRS) "$(DESTDIR)$(Rexecbindir)" |
+ @$(INSTALL_PROGRAM) Rscript "$(DESTDIR)$(Rexecbindir)/Rscript" |
+ ## substitute at install time to allow 'prefix' to be overridden |