OLD | NEW |
(Empty) | |
| 1 diff --git a/configure b/configure |
| 2 index adab221..f925f57 100755 |
| 3 --- a/configure |
| 4 +++ b/configure |
| 5 @@ -9547,7 +9547,8 @@ irix5* | irix6* | nonstopux*) |
| 6 ;; |
| 7 |
| 8 # This must be Linux ELF. |
| 9 -linux* | k*bsd*-gnu) |
| 10 +# Patched by naclports using patch_configure.py |
| 11 +linux* | k*bsd*-gnu | nacl*) |
| 12 lt_cv_deplibs_check_method=pass_all |
| 13 ;; |
| 14 |
| 15 @@ -14374,6 +14375,18 @@ uts4*) |
| 16 shlibpath_var=LD_LIBRARY_PATH |
| 17 ;; |
| 18 |
| 19 +nacl) |
| 20 + # Patched by naclports using patch_configure.py |
| 21 + if libc_so=`$CC -print-file-name=libc.so` && [ "$libc_so" != libc.so ]; then |
| 22 + dynamic_linker="GNU/NaCl ld.so" |
| 23 + version_type=linux |
| 24 + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}$
{release}${shared_ext}${major} ${libname}${shared_ext}' |
| 25 + soname_spec='${libname}${release}${shared_ext}$major' |
| 26 + else |
| 27 + dynamic_linker=no |
| 28 + fi |
| 29 + ;; |
| 30 + |
| 31 *) |
| 32 dynamic_linker=no |
| 33 ;; |
| 34 @@ -17820,6 +17833,18 @@ uts4*) |
| 35 shlibpath_var=LD_LIBRARY_PATH |
| 36 ;; |
| 37 |
| 38 +nacl) |
| 39 + # Patched by naclports using patch_configure.py |
| 40 + if libc_so=`$CC -print-file-name=libc.so` && [ "$libc_so" != libc.so ]; then |
| 41 + dynamic_linker="GNU/NaCl ld.so" |
| 42 + version_type=linux |
| 43 + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}$
{release}${shared_ext}${major} ${libname}${shared_ext}' |
| 44 + soname_spec='${libname}${release}${shared_ext}$major' |
| 45 + else |
| 46 + dynamic_linker=no |
| 47 + fi |
| 48 + ;; |
| 49 + |
| 50 *) |
| 51 dynamic_linker=no |
| 52 ;; |
| 53 @@ -20292,6 +20317,18 @@ uts4*) |
| 54 shlibpath_var=LD_LIBRARY_PATH |
| 55 ;; |
| 56 |
| 57 +nacl) |
| 58 + # Patched by naclports using patch_configure.py |
| 59 + if libc_so=`$CC -print-file-name=libc.so` && [ "$libc_so" != libc.so ]; then |
| 60 + dynamic_linker="GNU/NaCl ld.so" |
| 61 + version_type=linux |
| 62 + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}$
{release}${shared_ext}${major} ${libname}${shared_ext}' |
| 63 + soname_spec='${libname}${release}${shared_ext}$major' |
| 64 + else |
| 65 + dynamic_linker=no |
| 66 + fi |
| 67 + ;; |
| 68 + |
| 69 *) |
| 70 dynamic_linker=no |
| 71 ;; |
| 72 @@ -20896,7 +20933,7 @@ fi |
| 73 done |
| 74 |
| 75 r_save_LIBS="${LIBS}" |
| 76 - LIBS= |
| 77 +# LIBS= |
| 78 ## don't use the cached value as we need to rebuild LIBS |
| 79 unset ac_cv_lib_readline_rl_callback_read_char |
| 80 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_callback_read_char i
n -lreadline" >&5 |
| 81 @@ -23603,6 +23640,7 @@ for arg in ${FLIBS}; do |
| 82 done |
| 83 FLIBS="${flibs}" |
| 84 fi |
| 85 +FLIBS=-lgfortran |
| 86 |
| 87 if test -z "$FLIBS_IN_SO"; then |
| 88 FLIBS_IN_SO=${FLIBS} |
| 89 @@ -23619,7 +23657,7 @@ if ${ac_cv_f77_dummy_main+:} false; then : |
| 90 $as_echo_n "(cached) " >&6 |
| 91 else |
| 92 ac_f77_dm_save_LIBS=$LIBS |
| 93 - LIBS="$LIBS $FLIBS" |
| 94 + LIBS="$FLIBS $LIBS" |
| 95 ac_fortran_dm_var=F77_DUMMY_MAIN |
| 96 ac_ext=c |
| 97 ac_cpp='$CPP $CPPFLAGS' |
| 98 @@ -38391,6 +38429,18 @@ uts4*) |
| 99 shlibpath_var=LD_LIBRARY_PATH |
| 100 ;; |
| 101 |
| 102 +nacl) |
| 103 + # Patched by naclports using patch_configure.py |
| 104 + if libc_so=`$CC -print-file-name=libc.so` && [ "$libc_so" != libc.so ]; then |
| 105 + dynamic_linker="GNU/NaCl ld.so" |
| 106 + version_type=linux |
| 107 + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}$
{release}${shared_ext}${major} ${libname}${shared_ext}' |
| 108 + soname_spec='${libname}${release}${shared_ext}$major' |
| 109 + else |
| 110 + dynamic_linker=no |
| 111 + fi |
| 112 + ;; |
| 113 + |
| 114 *) |
| 115 dynamic_linker=no |
| 116 ;; |
| 117 diff --git a/src/include/Defn.h b/src/include/Defn.h |
| 118 index 6806957..ae813bc 100644 |
| 119 --- a/src/include/Defn.h |
| 120 +++ b/src/include/Defn.h |
| 121 @@ -194,6 +194,9 @@ extern void R_WaitEvent(void); |
| 122 # include <limits.h> |
| 123 #endif |
| 124 |
| 125 +#if defined(__native_client__) |
| 126 +# define HAVE_DECL_SIZE_MAX 1 |
| 127 +#endif |
| 128 #if defined HAVE_DECL_SIZE_MAX && HAVE_DECL_SIZE_MAX |
| 129 typedef size_t R_size_t; |
| 130 # define R_SIZE_T_MAX SIZE_MAX |
| 131 diff --git a/src/library/Makefile.in b/src/library/Makefile.in |
| 132 index 0fc2c27..43e918f 100644 |
| 133 --- a/src/library/Makefile.in |
| 134 +++ b/src/library/Makefile.in |
| 135 @@ -15,7 +15,8 @@ DISTFILES = Makefile.in Makefile.win |
| 136 |
| 137 SUBDIRS = profile $(R_PKGS_BASE) translations Recommended |
| 138 |
| 139 -R_EXE = $(top_builddir)/bin/R --vanilla --slave |
| 140 +#R_EXE = $(top_builddir)/bin/R --vanilla --slave |
| 141 +R_EXE = R --vanilla --slave |
| 142 |
| 143 .SUFFIXES: .inn .Rdts .Rdh |
| 144 |
| 145 @@ -38,7 +39,7 @@ R: |
| 146 (cd $${pkg} && $(MAKE) all) || exit 1; \ |
| 147 done |
| 148 @if test -z "$(R_NO_BASE_COMPILE)"; then \ |
| 149 - for pkg in base tools; do \ |
| 150 + for pkg in tools; do \ |
| 151 (cd $${pkg} && $(MAKE) mklazycomp) || exit 1; \ |
| 152 done; \ |
| 153 else \ |
| 154 @@ -49,7 +50,7 @@ R: |
| 155 @for pkg in $(R_PKGS_BASE1); do \ |
| 156 (cd $${pkg} && $(MAKE) all) || exit 1; \ |
| 157 done |
| 158 - @(cd base && $(MAKE) mkdesc) |
| 159 + #@(cd base && $(MAKE) mkdesc) |
| 160 @$(ECHO) "tools:::.vinstall_package_descriptions_as_RDS(\"$(top_builddir
)/library\", \"$(R_PKGS_BASE)\")" | \ |
| 161 R_DEFAULT_PACKAGES=tools LC_ALL=C $(R_EXE) > /dev/null |
| 162 @$(ECHO) "installing parsed NAMESPACE files" |
| 163 diff --git a/src/library/base/Makefile.in b/src/library/base/Makefile.in |
| 164 index 87e706f..d574324 100644 |
| 165 --- a/src/library/base/Makefile.in |
| 166 +++ b/src/library/base/Makefile.in |
| 167 @@ -17,7 +17,8 @@ pkg = base |
| 168 |
| 169 RSRC = `LC_COLLATE=C ls $(srcdir)/R/*.R $(srcdir)/R/$(R_OSTYPE)/*.R` |
| 170 |
| 171 -R_EXE = $(top_builddir)/bin/R --vanilla --slave |
| 172 +#R_EXE = $(top_builddir)/bin/R --vanilla --slave |
| 173 +R_EXE = R --vanilla --slave |
| 174 |
| 175 ## For people who do make -C ../src/library/base |
| 176 update: |
| 177 diff --git a/src/library/compiler/Makefile.in b/src/library/compiler/Makefile.in |
| 178 index 18fe856..17a2110 100644 |
| 179 --- a/src/library/compiler/Makefile.in |
| 180 +++ b/src/library/compiler/Makefile.in |
| 181 @@ -15,7 +15,8 @@ DISTFILES = DESCRIPTION.in Makefile.in Makefile.win NAMESPACE |
| 182 |
| 183 pkg = compiler |
| 184 |
| 185 -R_EXE = $(top_builddir)/bin/R --vanilla --slave |
| 186 +#R_EXE = $(top_builddir)/bin/R --vanilla --slave |
| 187 +R_EXE = R --vanilla --slave |
| 188 |
| 189 RSRC = `LC_COLLATE=C ls $(srcdir)/R/*.R` |
| 190 DEFPKGS = NULL |
| 191 diff --git a/src/library/datasets/Makefile.in b/src/library/datasets/Makefile.in |
| 192 index 8f12675..440da1c 100644 |
| 193 --- a/src/library/datasets/Makefile.in |
| 194 +++ b/src/library/datasets/Makefile.in |
| 195 @@ -15,7 +15,8 @@ DISTFILES = DESCRIPTION.in Makefile.in Makefile.win NAMESPACE |
| 196 |
| 197 pkg = datasets |
| 198 |
| 199 -R_EXE = $(top_builddir)/bin/R --vanilla --slave |
| 200 +#R_EXE = $(top_builddir)/bin/R --vanilla --slave |
| 201 +R_EXE = R --vanilla --slave |
| 202 |
| 203 all: Makefile DESCRIPTION |
| 204 @$(ECHO) "building package '$(pkg)'" |
| 205 @@ -26,8 +27,8 @@ all: Makefile DESCRIPTION |
| 206 $(INSTALL_DATA) $${f} $(top_builddir)/library/$(pkg)/data; \ |
| 207 done |
| 208 @rm -f $(top_builddir)/library/$(pkg)/data/Rdata.* |
| 209 - @$(ECHO) "tools:::data2LazyLoadDB(\"$(pkg)\", compress=3)" | \ |
| 210 - R_DEFAULT_PACKAGES=NULL LC_ALL=C $(R_EXE) > /dev/null |
| 211 + #@$(ECHO) "tools:::data2LazyLoadDB(\"$(pkg)\", compress=3)" | \ |
| 212 + # R_DEFAULT_PACKAGES=NULL LC_ALL=C $(R_EXE) > /dev/null |
| 213 @$(INSTALL_DATA) $(srcdir)/data/morley.tab \ |
| 214 $(top_builddir)/library/$(pkg)/data |
| 215 |
| 216 diff --git a/src/library/grDevices/Makefile.in b/src/library/grDevices/Makefile.
in |
| 217 index 12a3650..3aef427 100644 |
| 218 --- a/src/library/grDevices/Makefile.in |
| 219 +++ b/src/library/grDevices/Makefile.in |
| 220 @@ -14,7 +14,8 @@ include $(top_builddir)/Makeconf |
| 221 distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) |
| 222 DISTFILES = DESCRIPTION.in Makefile.in Makefile.win NAMESPACE |
| 223 |
| 224 -R_EXE = $(top_builddir)/bin/R --vanilla --slave |
| 225 +#R_EXE = $(top_builddir)/bin/R --vanilla --slave |
| 226 +R_EXE = R --vanilla --slave |
| 227 |
| 228 RSRC = `LC_COLLATE=C ls $(srcdir)/R/*.R $(srcdir)/R/$(R_OSTYPE)/*.R` |
| 229 INSTDIRS = afm enc icc |
| 230 diff --git a/src/library/graphics/Makefile.in b/src/library/graphics/Makefile.in |
| 231 index 052730e..0ba36d4 100644 |
| 232 --- a/src/library/graphics/Makefile.in |
| 233 +++ b/src/library/graphics/Makefile.in |
| 234 @@ -14,7 +14,8 @@ include $(top_builddir)/Makeconf |
| 235 distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) |
| 236 DISTFILES = DESCRIPTION.in Makefile.in Makefile.win NAMESPACE |
| 237 |
| 238 -R_EXE = $(top_builddir)/bin/R --vanilla --slave |
| 239 +#R_EXE = $(top_builddir)/bin/R --vanilla --slave |
| 240 +R_EXE = R --vanilla --slave |
| 241 |
| 242 RSRC = `LC_COLLATE=C ls $(srcdir)/R/*.R` |
| 243 DEFPKGS = NULL |
| 244 diff --git a/src/library/grid/Makefile.in b/src/library/grid/Makefile.in |
| 245 index 977266b..2f6df96 100644 |
| 246 --- a/src/library/grid/Makefile.in |
| 247 +++ b/src/library/grid/Makefile.in |
| 248 @@ -18,7 +18,8 @@ pkg = grid |
| 249 RSRC = `LC_COLLATE=C ls $(srcdir)/R/*.R` |
| 250 INSTDIRS = doc |
| 251 |
| 252 -R_EXE = $(top_builddir)/bin/R --vanilla --slave |
| 253 +#R_EXE = $(top_builddir)/bin/R --vanilla --slave |
| 254 +R_EXE = R --vanilla --slave |
| 255 DEFPKGS = NULL |
| 256 |
| 257 all: Makefile DESCRIPTION |
| 258 diff --git a/src/library/methods/Makefile.in b/src/library/methods/Makefile.in |
| 259 index 256fddc..96ff731 100644 |
| 260 --- a/src/library/methods/Makefile.in |
| 261 +++ b/src/library/methods/Makefile.in |
| 262 @@ -16,7 +16,8 @@ pkg = methods |
| 263 |
| 264 RSRC = `LC_COLLATE=C ls $(srcdir)/R/*.R` |
| 265 |
| 266 -R_EXE = $(top_builddir)/bin/R --vanilla --slave |
| 267 +#R_EXE = $(top_builddir)/bin/R --vanilla --slave |
| 268 +R_EXE = R --vanilla --slave |
| 269 EXTRAS = @BYTE_COMPILE_PACKAGES_TRUE@ R_COMPILE_PKGS=1 R_COMPILER_SUPPRESS_ALL=
1 |
| 270 |
| 271 all: Makefile DESCRIPTION |
| 272 diff --git a/src/library/parallel/Makefile.in b/src/library/parallel/Makefile.in |
| 273 index 1e5e9a1..6fba37e 100644 |
| 274 --- a/src/library/parallel/Makefile.in |
| 275 +++ b/src/library/parallel/Makefile.in |
| 276 @@ -18,7 +18,8 @@ pkg = parallel |
| 277 RSRC = `LC_COLLATE=C ls $(srcdir)/R/*.R $(srcdir)/R/$(R_OSTYPE)/*.R` |
| 278 INSTDIRS = doc |
| 279 |
| 280 -R_EXE = $(top_builddir)/bin/R --vanilla --slave |
| 281 +#R_EXE = $(top_builddir)/bin/R --vanilla --slave |
| 282 +R_EXE = R --vanilla --slave |
| 283 DEFPKGS = NULL |
| 284 |
| 285 all: Makefile DESCRIPTION |
| 286 diff --git a/src/library/parallel/src/fork.c b/src/library/parallel/src/fork.c |
| 287 index 551fbc7..4ddb7dc 100644 |
| 288 --- a/src/library/parallel/src/fork.c |
| 289 +++ b/src/library/parallel/src/fork.c |
| 290 @@ -228,7 +228,9 @@ static void setup_sig_handler() { |
| 291 /* sigaction is not viable, so use the "dumb" way |
| 292 to clean up anything that comes our way */ |
| 293 static void setup_sig_handler() { |
| 294 +#if !defined(__native_client__) |
| 295 signal(SIGCHLD, parent_sig_handler); |
| 296 +#endif |
| 297 } |
| 298 |
| 299 static void parent_sig_handler(int sig) { |
| 300 diff --git a/src/library/splines/Makefile.in b/src/library/splines/Makefile.in |
| 301 index 8e1eeb5..9cbc40a 100644 |
| 302 --- a/src/library/splines/Makefile.in |
| 303 +++ b/src/library/splines/Makefile.in |
| 304 @@ -18,7 +18,8 @@ pkg = splines |
| 305 |
| 306 RSRC = `LC_COLLATE=C ls $(srcdir)/R/*.R` |
| 307 |
| 308 -R_EXE = $(top_builddir)/bin/R --vanilla --slave |
| 309 +#R_EXE = $(top_builddir)/bin/R --vanilla --slave |
| 310 +R_EXE = R --vanilla --slave |
| 311 DEFPKGS = NULL |
| 312 |
| 313 all: Makefile DESCRIPTION |
| 314 diff --git a/src/library/stats/Makefile.in b/src/library/stats/Makefile.in |
| 315 index 38bcdb8..b16ab24 100644 |
| 316 --- a/src/library/stats/Makefile.in |
| 317 +++ b/src/library/stats/Makefile.in |
| 318 @@ -18,7 +18,8 @@ pkg = stats |
| 319 |
| 320 FRONTFILES = COPYRIGHTS.modreg SOURCES.ts |
| 321 |
| 322 -R_EXE = $(top_builddir)/bin/R --vanilla --slave |
| 323 +#R_EXE = $(top_builddir)/bin/R --vanilla --slave |
| 324 +R_EXE = R --vanilla --slave |
| 325 |
| 326 RSRC = `LC_COLLATE=C ls $(srcdir)/R/*.R` |
| 327 DEFPKGS = NULL |
| 328 diff --git a/src/library/stats4/Makefile.in b/src/library/stats4/Makefile.in |
| 329 index f995992..599a260 100644 |
| 330 --- a/src/library/stats4/Makefile.in |
| 331 +++ b/src/library/stats4/Makefile.in |
| 332 @@ -15,7 +15,8 @@ DISTFILES = DESCRIPTION.in Makefile.in Makefile.win NAMESPACE |
| 333 |
| 334 pkg = stats4 |
| 335 |
| 336 -R_EXE = $(top_builddir)/bin/R --vanilla --slave |
| 337 +#R_EXE = $(top_builddir)/bin/R --vanilla --slave |
| 338 +R_EXE = R --vanilla --slave |
| 339 DEFPKGS = "methods,graphics,stats" |
| 340 |
| 341 all: Makefile DESCRIPTION |
| 342 diff --git a/src/library/tcltk/Makefile.in b/src/library/tcltk/Makefile.in |
| 343 index ee983ff..bb01f29 100644 |
| 344 --- a/src/library/tcltk/Makefile.in |
| 345 +++ b/src/library/tcltk/Makefile.in |
| 346 @@ -15,7 +15,8 @@ DISTFILES = DESCRIPTION.in Makefile.in Makefile.win NAMESPACE |
| 347 |
| 348 pkg = tcltk |
| 349 |
| 350 -R_EXE = $(top_builddir)/bin/R --vanilla --slave |
| 351 +#R_EXE = $(top_builddir)/bin/R --vanilla --slave |
| 352 +R_EXE = R --vanilla --slave |
| 353 |
| 354 RSRC = `LC_COLLATE=C ls $(srcdir)/R/*.R $(srcdir)/R/$(R_OSTYPE)/zzz.R` |
| 355 DEFPKGS = NULL |
| 356 diff --git a/src/library/tools/Makefile.in b/src/library/tools/Makefile.in |
| 357 index fcbd3eb..5081f20 100644 |
| 358 --- a/src/library/tools/Makefile.in |
| 359 +++ b/src/library/tools/Makefile.in |
| 360 @@ -17,7 +17,8 @@ pkg = tools |
| 361 |
| 362 RSRC = `LC_COLLATE=C ls $(srcdir)/R/*.R` |
| 363 |
| 364 -R_EXE = $(top_builddir)/bin/R --vanilla --slave |
| 365 +#R_EXE = $(top_builddir)/bin/R --vanilla --slave |
| 366 +R_EXE = R --vanilla --slave |
| 367 |
| 368 ## For people who do make -C ../src/library/tools |
| 369 update: |
| 370 diff --git a/src/library/utils/Makefile.in b/src/library/utils/Makefile.in |
| 371 index a15cd28..8890014 100644 |
| 372 --- a/src/library/utils/Makefile.in |
| 373 +++ b/src/library/utils/Makefile.in |
| 374 @@ -15,7 +15,8 @@ DISTFILES = DESCRIPTION.in Makefile.in Makefile.win NAMESPACE |
| 375 |
| 376 pkg = utils |
| 377 |
| 378 -R_EXE = $(top_builddir)/bin/R --vanilla --slave |
| 379 +#R_EXE = $(top_builddir)/bin/R --vanilla --slave |
| 380 +R_EXE = R --vanilla --slave |
| 381 |
| 382 RSRC = `LC_COLLATE=C ls $(srcdir)/R/*.R $(srcdir)/R/$(R_OSTYPE)/*.R` |
| 383 INSTDIRS = Sweave doc misc |
| 384 diff --git a/src/unix/Makefile.in b/src/unix/Makefile.in |
| 385 index e77ad01..6690f28 100644 |
| 386 --- a/src/unix/Makefile.in |
| 387 +++ b/src/unix/Makefile.in |
| 388 @@ -65,7 +65,7 @@ maintainer-clean: distclean |
| 389 ## we need to build at install time to capture the correct 'rhome' |
| 390 install-Rscript: |
| 391 $(CC) $(ALL_CPPFLAGS) $(ALL_CFLAGS) $(LDFLAGS) -DR_HOME='"$(rhome)"' \ |
| 392 - -o Rscript $(srcdir)/Rscript.c |
| 393 + -o Rscript $(srcdir)/Rscript.c $(LIBS) |
| 394 @$(MKINSTALLDIRS) "$(DESTDIR)$(Rexecbindir)" |
| 395 @$(INSTALL_PROGRAM) Rscript "$(DESTDIR)$(Rexecbindir)/Rscript" |
| 396 ## substitute at install time to allow 'prefix' to be overridden |
OLD | NEW |