Update to 3.2.2 Upstream changes: CHANGES IN R 3.2.2: SIGNIFICANT USER-VISIBLE CHANGES: * It is now easier to use secure downloads from https:// URLs on builds which support them: no longer do non-default options need to be selected to do so. In particular, packages can be installed from repositories which offer https:// URLs, and those listed by setRepositories() now do so (for some of their mirrors). Support for https:// URLs is available on Windows, and on other platforms if support for libcurl was compiled in and if that supports the https protocol (system installations can be expected to do). So https:// support can be expected except on rather old OSes (an example being OS X 'Snow Leopard', where a non-system version of libcurl can be used). (Windows only) The default method for accessing URLs _via_ download.file() and url() has been changed to be "wininet" using Windows API calls. This changes the way proxies need to be set and security settings made: there have been some reports of sites being inaccessible under the new default method (but the previous methods remain available). NEW FEATURES: * cmdscale() gets new option list. for increased flexibility when a list should be returned. * configure now supports texinfo version 6.0, which (unlike the change from 4.x to 5.0) is a minor update. (Wish of PR#16456.) * (Non-Windows only) download.file() with default method = "auto" now chooses "libcurl" if that is available and a https:// or ftps:// URL is used. * (Windows only) setInternet2(TRUE) is now the default. The command-line option --internet2 and environment variable R_WIN_INTERNET2 are now ignored. Thus by default the "internal" method for download.file() and url() uses the "wininet" method: to revert to the previous default use setInternet2(FALSE). This means that https:// can be read by default by download.file() (they have been readable by file() and url() since R 3.2.0). There are implications for how proxies need to be set (see ?download.file): also, cacheOK = FALSE is not supported. * chooseCRANmirror() and chooseBioCmirror() now offer HTTPS mirrors in preference to HTTP mirrors. This changes the interpretation of their ind arguments: see their help pages. * capture.output() gets optional arguments type and split to pass to sink(), and hence can be used to capture messages. C-LEVEL FACILITIES: * Header Rconfig.h now defines HAVE_ALLOCA_H if the platform has the alloca.h header (it is needed to define alloca on Solaris and AIX, at least: see 'Writing R Extensions' for how to use it). INSTALLATION and INCLUDED SOFTWARE: * The libtool script generated by configure has been modified to support FreeBSD >= 10 (PR#16410). BUG FIXES: * The HTML help page links to demo code failed due to a change in R 3.2.0. (PR#16432) * If the na.action argument was used in model.frame(), the original data could be modified. (PR#16436) * getGraphicsEvent() could cause a crash if a graphics window was closed while it was in use. (PR#16438) * matrix(x, nr, nc, byrow = TRUE) failed if x was an object of type "expression". * strptime() could overflow the allocated storage on the C stack when the timezone had a non-standard format much longer than the standard formats. (Part of PR#16328.) * options(OutDec = s) now signals a warning (which will become an error in the future) when s is not a string with exactly one character, as that has been a documented requirement. * prettyNum() gains a new option input.d.mark which together with other changes, e.g., the default for decimal.mark, fixes some format()ting variants with non-default getOption("OutDec") such as in PR#16411. * download.packages() failed for type equal to either "both" or "binary". (Reported by Dan Tenenbaum.) * The dendrogram method of labels() is much more efficient for large dendrograms, now using rapply(). (Comment #15 of PR#15215) * The "port" algorithm of nls() could give spurious errors. (Reported by Radford Neal.) * Reference classes that inherited from reference classes in another package could invalidate methods of the inherited class. Fixing this requires adding the ability for methods to be "external", with the object supplied explicitly as the first argument, named .self. See "Inter-Package Superclasses" in the documentation. * readBin() could fail on the SPARC architecture due to alignment issues. (Reported by Radford Neal.) * qt(*, df=Inf, ncp=.) now uses the natural qnorm() limit instead of returning NaN. (PR#16475) * Auto-printing of S3 and S4 values now searches for print() in the base namespace and show() in the methods namespace instead of searching the global environment. * polym() gains a coefs = NULL argument and returns class "poly" just like poly() which gets a new simple=FALSE option. They now lead to correct predict()ions, e.g., on subsets of the original data. * rhyper(nn, <large>) now works correctly. (PR#16489) * ttkimage() did not (and could not) work so was removed. Ditto for tkimage.cget() and tkimage.configure(). Added two Ttk widgets and missing subcommands for Tk's image command: ttkscale(), ttkspinbox(), tkimage.delete(), tkimage.height(), tkimage.inuse(), tkimage.type(), tkimage.types(), tkimage.width(). (PR#15372, PR#16450) * getClass("foo") now also returns a class definition when it is found in the cache more than once.diff -r1.160 -r1.161 pkgsrc/math/R/Makefile
(wen)
@@ -1,16 +1,16 @@ | @@ -1,16 +1,16 @@ | |||
1 | # $NetBSD: Makefile,v 1.160 2015/06/30 02:38:52 wen Exp $ | 1 | # $NetBSD: Makefile,v 1.161 2015/08/14 12:40:19 wen Exp $ | |
2 | 2 | |||
3 | DISTNAME= R-3.2.1 | 3 | DISTNAME= R-3.2.2 | |
4 | CATEGORIES= math | 4 | CATEGORIES= math | |
5 | MASTER_SITES= ${MASTER_SITE_R_CRAN:=base/R-3/} | 5 | MASTER_SITES= ${MASTER_SITE_R_CRAN:=base/R-3/} | |
6 | 6 | |||
7 | MAINTAINER= markd@NetBSD.org | 7 | MAINTAINER= markd@NetBSD.org | |
8 | HOMEPAGE= http://www.R-project.org/ | 8 | HOMEPAGE= http://www.R-project.org/ | |
9 | COMMENT= Statistical language for data analysis and graphics | 9 | COMMENT= Statistical language for data analysis and graphics | |
10 | LICENSE= gnu-gpl-v2 | 10 | LICENSE= gnu-gpl-v2 | |
11 | 11 | |||
12 | #needs FPC code not found in older versions of NetBSD | 12 | #needs FPC code not found in older versions of NetBSD | |
13 | NOT_FOR_PLATFORM= NetBSD-1.[0-4]*-alpha NetBSD-1.5-alpha \ | 13 | NOT_FOR_PLATFORM= NetBSD-1.[0-4]*-alpha NetBSD-1.5-alpha \ | |
14 | NetBSD-1.5.*-alpha NetBSD-1.5[A-U]-alpha | 14 | NetBSD-1.5.*-alpha NetBSD-1.5[A-U]-alpha | |
15 | 15 | |||
16 | USE_GCC_RUNTIME= yes | 16 | USE_GCC_RUNTIME= yes |
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.22 2015/05/26 13:36:57 jperkin Exp $ | 1 | @comment $NetBSD: PLIST,v 1.23 2015/08/14 12:40:19 wen Exp $ | |
2 | bin/R | 2 | bin/R | |
3 | bin/Rscript | 3 | bin/Rscript | |
4 | info/R-FAQ.info.gz | 4 | info/R-FAQ.info.gz | |
5 | info/R-admin.info.gz | 5 | info/R-admin.info.gz | |
6 | info/R-data.info.gz | 6 | info/R-data.info.gz | |
7 | info/R-exts.info.gz | 7 | info/R-exts.info.gz | |
8 | info/R-intro.info.gz | 8 | info/R-intro.info.gz | |
9 | info/R-ints.info.gz | 9 | info/R-ints.info.gz | |
10 | info/R-lang.info.gz | 10 | info/R-lang.info.gz | |
11 | lib/R/COPYING | 11 | lib/R/COPYING | |
12 | lib/R/SVN-REVISION | 12 | lib/R/SVN-REVISION | |
13 | lib/R/bin/BATCH | 13 | lib/R/bin/BATCH | |
14 | lib/R/bin/COMPILE | 14 | lib/R/bin/COMPILE | |
@@ -26,26 +26,27 @@ lib/R/bin/SHLIB | @@ -26,26 +26,27 @@ lib/R/bin/SHLIB | |||
26 | lib/R/bin/Stangle | 26 | lib/R/bin/Stangle | |
27 | lib/R/bin/Sweave | 27 | lib/R/bin/Sweave | |
28 | lib/R/bin/build | 28 | lib/R/bin/build | |
29 | lib/R/bin/check | 29 | lib/R/bin/check | |
30 | lib/R/bin/config | 30 | lib/R/bin/config | |
31 | lib/R/bin/exec/R | 31 | lib/R/bin/exec/R | |
32 | lib/R/bin/f77_f2c | 32 | lib/R/bin/f77_f2c | |
33 | lib/R/bin/javareconf | 33 | lib/R/bin/javareconf | |
34 | lib/R/bin/libtool | 34 | lib/R/bin/libtool | |
35 | lib/R/bin/mkinstalldirs | 35 | lib/R/bin/mkinstalldirs | |
36 | lib/R/bin/pager | 36 | lib/R/bin/pager | |
37 | lib/R/bin/rtags | 37 | lib/R/bin/rtags | |
38 | lib/R/doc/AUTHORS | 38 | lib/R/doc/AUTHORS | |
39 | lib/R/doc/BioC_mirrors.csv | |||
39 | lib/R/doc/COPYING | 40 | lib/R/doc/COPYING | |
40 | lib/R/doc/COPYRIGHTS | 41 | lib/R/doc/COPYRIGHTS | |
41 | lib/R/doc/CRAN_mirrors.csv | 42 | lib/R/doc/CRAN_mirrors.csv | |
42 | lib/R/doc/FAQ | 43 | lib/R/doc/FAQ | |
43 | lib/R/doc/KEYWORDS | 44 | lib/R/doc/KEYWORDS | |
44 | lib/R/doc/KEYWORDS.db | 45 | lib/R/doc/KEYWORDS.db | |
45 | lib/R/doc/NEWS | 46 | lib/R/doc/NEWS | |
46 | lib/R/doc/NEWS.0 | 47 | lib/R/doc/NEWS.0 | |
47 | lib/R/doc/NEWS.1 | 48 | lib/R/doc/NEWS.1 | |
48 | lib/R/doc/NEWS.2 | 49 | lib/R/doc/NEWS.2 | |
49 | lib/R/doc/NEWS.pdf | 50 | lib/R/doc/NEWS.pdf | |
50 | lib/R/doc/NEWS.rds | 51 | lib/R/doc/NEWS.rds | |
51 | lib/R/doc/RESOURCES | 52 | lib/R/doc/RESOURCES | |
@@ -353,44 +354,48 @@ lib/R/library/class/po/en@quot/LC_MESSAG | @@ -353,44 +354,48 @@ lib/R/library/class/po/en@quot/LC_MESSAG | |||
353 | lib/R/library/class/po/fr/LC_MESSAGES/R-class.mo | 354 | lib/R/library/class/po/fr/LC_MESSAGES/R-class.mo | |
354 | lib/R/library/class/po/ko/LC_MESSAGES/R-class.mo | 355 | lib/R/library/class/po/ko/LC_MESSAGES/R-class.mo | |
355 | lib/R/library/class/po/pl/LC_MESSAGES/R-class.mo | 356 | lib/R/library/class/po/pl/LC_MESSAGES/R-class.mo | |
356 | lib/R/library/cluster/CITATION | 357 | lib/R/library/cluster/CITATION | |
357 | lib/R/library/cluster/DESCRIPTION | 358 | lib/R/library/cluster/DESCRIPTION | |
358 | lib/R/library/cluster/INDEX | 359 | lib/R/library/cluster/INDEX | |
359 | lib/R/library/cluster/Meta/Rd.rds | 360 | lib/R/library/cluster/Meta/Rd.rds | |
360 | lib/R/library/cluster/Meta/data.rds | 361 | lib/R/library/cluster/Meta/data.rds | |
361 | lib/R/library/cluster/Meta/hsearch.rds | 362 | lib/R/library/cluster/Meta/hsearch.rds | |
362 | lib/R/library/cluster/Meta/links.rds | 363 | lib/R/library/cluster/Meta/links.rds | |
363 | lib/R/library/cluster/Meta/nsInfo.rds | 364 | lib/R/library/cluster/Meta/nsInfo.rds | |
364 | lib/R/library/cluster/Meta/package.rds | 365 | lib/R/library/cluster/Meta/package.rds | |
365 | lib/R/library/cluster/NAMESPACE | 366 | lib/R/library/cluster/NAMESPACE | |
367 | lib/R/library/cluster/NEWS.Rd | |||
366 | lib/R/library/cluster/R/cluster | 368 | lib/R/library/cluster/R/cluster | |
367 | lib/R/library/cluster/R/cluster.rdb | 369 | lib/R/library/cluster/R/cluster.rdb | |
368 | lib/R/library/cluster/R/cluster.rdx | 370 | lib/R/library/cluster/R/cluster.rdx | |
369 | lib/R/library/cluster/data/Rdata.rdb | 371 | lib/R/library/cluster/data/Rdata.rdb | |
370 | lib/R/library/cluster/data/Rdata.rds | 372 | lib/R/library/cluster/data/Rdata.rds | |
371 | lib/R/library/cluster/data/Rdata.rdx | 373 | lib/R/library/cluster/data/Rdata.rdx | |
372 | lib/R/library/cluster/help/AnIndex | 374 | lib/R/library/cluster/help/AnIndex | |
373 | lib/R/library/cluster/help/aliases.rds | 375 | lib/R/library/cluster/help/aliases.rds | |
374 | lib/R/library/cluster/help/cluster.rdb | 376 | lib/R/library/cluster/help/cluster.rdb | |
375 | lib/R/library/cluster/help/cluster.rdx | 377 | lib/R/library/cluster/help/cluster.rdx | |
376 | lib/R/library/cluster/help/paths.rds | 378 | lib/R/library/cluster/help/paths.rds | |
377 | lib/R/library/cluster/html/00Index.html | 379 | lib/R/library/cluster/html/00Index.html | |
378 | lib/R/library/cluster/html/R.css | 380 | lib/R/library/cluster/html/R.css | |
379 | lib/R/library/cluster/libs/cluster.so | 381 | lib/R/library/cluster/libs/cluster.so | |
380 | lib/R/library/cluster/po/de/LC_MESSAGES/R-cluster.mo | 382 | lib/R/library/cluster/po/de/LC_MESSAGES/R-cluster.mo | |
383 | lib/R/library/cluster/po/de/LC_MESSAGES/cluster.mo | |||
381 | lib/R/library/cluster/po/en@quot/LC_MESSAGES/R-cluster.mo | 384 | lib/R/library/cluster/po/en@quot/LC_MESSAGES/R-cluster.mo | |
382 | lib/R/library/cluster/po/en@quot/LC_MESSAGES/cluster.mo | 385 | lib/R/library/cluster/po/en@quot/LC_MESSAGES/cluster.mo | |
383 | lib/R/library/cluster/po/fr/LC_MESSAGES/R-cluster.mo | 386 | lib/R/library/cluster/po/fr/LC_MESSAGES/R-cluster.mo | |
387 | lib/R/library/cluster/po/ko/LC_MESSAGES/R-cluster.mo | |||
388 | lib/R/library/cluster/po/ko/LC_MESSAGES/cluster.mo | |||
384 | lib/R/library/cluster/po/pl/LC_MESSAGES/R-cluster.mo | 389 | lib/R/library/cluster/po/pl/LC_MESSAGES/R-cluster.mo | |
385 | lib/R/library/codetools/DESCRIPTION | 390 | lib/R/library/codetools/DESCRIPTION | |
386 | lib/R/library/codetools/INDEX | 391 | lib/R/library/codetools/INDEX | |
387 | lib/R/library/codetools/Meta/Rd.rds | 392 | lib/R/library/codetools/Meta/Rd.rds | |
388 | lib/R/library/codetools/Meta/hsearch.rds | 393 | lib/R/library/codetools/Meta/hsearch.rds | |
389 | lib/R/library/codetools/Meta/links.rds | 394 | lib/R/library/codetools/Meta/links.rds | |
390 | lib/R/library/codetools/Meta/nsInfo.rds | 395 | lib/R/library/codetools/Meta/nsInfo.rds | |
391 | lib/R/library/codetools/Meta/package.rds | 396 | lib/R/library/codetools/Meta/package.rds | |
392 | lib/R/library/codetools/NAMESPACE | 397 | lib/R/library/codetools/NAMESPACE | |
393 | lib/R/library/codetools/R/codetools | 398 | lib/R/library/codetools/R/codetools | |
394 | lib/R/library/codetools/R/codetools.rdb | 399 | lib/R/library/codetools/R/codetools.rdb | |
395 | lib/R/library/codetools/R/codetools.rdx | 400 | lib/R/library/codetools/R/codetools.rdx | |
396 | lib/R/library/codetools/help/AnIndex | 401 | lib/R/library/codetools/help/AnIndex | |
@@ -749,28 +754,26 @@ lib/R/library/mgcv/help/paths.rds | @@ -749,28 +754,26 @@ lib/R/library/mgcv/help/paths.rds | |||
749 | lib/R/library/mgcv/html/00Index.html | 754 | lib/R/library/mgcv/html/00Index.html | |
750 | lib/R/library/mgcv/html/R.css | 755 | lib/R/library/mgcv/html/R.css | |
751 | lib/R/library/mgcv/libs/mgcv.so | 756 | lib/R/library/mgcv/libs/mgcv.so | |
752 | lib/R/library/mgcv/po/de/LC_MESSAGES/R-mgcv.mo | 757 | lib/R/library/mgcv/po/de/LC_MESSAGES/R-mgcv.mo | |
753 | lib/R/library/mgcv/po/de/LC_MESSAGES/mgcv.mo | 758 | lib/R/library/mgcv/po/de/LC_MESSAGES/mgcv.mo | |
754 | lib/R/library/mgcv/po/en@quot/LC_MESSAGES/R-mgcv.mo | 759 | lib/R/library/mgcv/po/en@quot/LC_MESSAGES/R-mgcv.mo | |
755 | lib/R/library/mgcv/po/en@quot/LC_MESSAGES/mgcv.mo | 760 | lib/R/library/mgcv/po/en@quot/LC_MESSAGES/mgcv.mo | |
756 | lib/R/library/mgcv/po/fr/LC_MESSAGES/R-mgcv.mo | 761 | lib/R/library/mgcv/po/fr/LC_MESSAGES/R-mgcv.mo | |
757 | lib/R/library/mgcv/po/fr/LC_MESSAGES/mgcv.mo | 762 | lib/R/library/mgcv/po/fr/LC_MESSAGES/mgcv.mo | |
758 | lib/R/library/mgcv/po/ko/LC_MESSAGES/R-mgcv.mo | 763 | lib/R/library/mgcv/po/ko/LC_MESSAGES/R-mgcv.mo | |
759 | lib/R/library/mgcv/po/ko/LC_MESSAGES/mgcv.mo | 764 | lib/R/library/mgcv/po/ko/LC_MESSAGES/mgcv.mo | |
760 | lib/R/library/mgcv/po/pl/LC_MESSAGES/R-mgcv.mo | 765 | lib/R/library/mgcv/po/pl/LC_MESSAGES/R-mgcv.mo | |
761 | lib/R/library/mgcv/po/pl/LC_MESSAGES/mgcv.mo | 766 | lib/R/library/mgcv/po/pl/LC_MESSAGES/mgcv.mo | |
762 | lib/R/library/mgcv/po/po/LC_MESSAGES/R-mgcv.mo | |||
763 | lib/R/library/mgcv/po/po/LC_MESSAGES/mgcv.mo | |||
764 | lib/R/library/nlme/CITATION | 767 | lib/R/library/nlme/CITATION | |
765 | lib/R/library/nlme/DESCRIPTION | 768 | lib/R/library/nlme/DESCRIPTION | |
766 | lib/R/library/nlme/INDEX | 769 | lib/R/library/nlme/INDEX | |
767 | lib/R/library/nlme/Meta/Rd.rds | 770 | lib/R/library/nlme/Meta/Rd.rds | |
768 | lib/R/library/nlme/Meta/data.rds | 771 | lib/R/library/nlme/Meta/data.rds | |
769 | lib/R/library/nlme/Meta/hsearch.rds | 772 | lib/R/library/nlme/Meta/hsearch.rds | |
770 | lib/R/library/nlme/Meta/links.rds | 773 | lib/R/library/nlme/Meta/links.rds | |
771 | lib/R/library/nlme/Meta/nsInfo.rds | 774 | lib/R/library/nlme/Meta/nsInfo.rds | |
772 | lib/R/library/nlme/Meta/package.rds | 775 | lib/R/library/nlme/Meta/package.rds | |
773 | lib/R/library/nlme/NAMESPACE | 776 | lib/R/library/nlme/NAMESPACE | |
774 | lib/R/library/nlme/R/nlme | 777 | lib/R/library/nlme/R/nlme | |
775 | lib/R/library/nlme/R/nlme.rdb | 778 | lib/R/library/nlme/R/nlme.rdb | |
776 | lib/R/library/nlme/R/nlme.rdx | 779 | lib/R/library/nlme/R/nlme.rdx |
@@ -1,10 +1,10 @@ | @@ -1,10 +1,10 @@ | |||
1 | $NetBSD: distinfo,v 1.68 2015/07/03 12:45:03 joerg Exp $ | 1 | $NetBSD: distinfo,v 1.69 2015/08/14 12:40:19 wen Exp $ | |
2 | 2 | |||
3 | SHA1 (R-3.2.1.tar.gz) = 74476c4d356f227bf0f17c8c21e63459861fbc93 | 3 | SHA1 (R-3.2.2.tar.gz) = 68c74db1c5a2f2040280a03b8396e4d28a5a7617 | |
4 | RMD160 (R-3.2.1.tar.gz) = dea095b5c7b32189b6768d5949243bd869564e9f | 4 | RMD160 (R-3.2.2.tar.gz) = 0e8bf2ecca48f0f2433f6b07f422b7730a76fbb4 | |
5 | Size (R-3.2.1.tar.gz) = 29197870 bytes | 5 | Size (R-3.2.2.tar.gz) = 29772864 bytes | |
6 | SHA1 (patch-ac) = bf54bef2396714b1d92418d0ad1ecf09610abdfd | 6 | SHA1 (patch-ac) = 1dc842ca867a1efa4f757ec5cbdca68a6957dd55 | |
7 | SHA1 (patch-ad) = 0a08f293bc1cdc130047868e5d574c2df1f4c6cf | 7 | SHA1 (patch-ad) = 0a08f293bc1cdc130047868e5d574c2df1f4c6cf | |
8 | SHA1 (patch-src_include_GraphicsBase.h) = 5f999e4d124afd38d5c7e18d936942f2c6f27c86 | 8 | SHA1 (patch-src_include_GraphicsBase.h) = 5f999e4d124afd38d5c7e18d936942f2c6f27c86 | |
9 | SHA1 (patch-src_library_stats_src_Makefile.in) = b468becd011fa4828e50f5d13d700825655c89e8 | 9 | SHA1 (patch-src_library_stats_src_Makefile.in) = b468becd011fa4828e50f5d13d700825655c89e8 | |
10 | SHA1 (patch-src_main_character.c) = bd6e9b5b633d86c913c98d9d87c66f982d1ca258 | 10 | SHA1 (patch-src_main_character.c) = bd6e9b5b633d86c913c98d9d87c66f982d1ca258 |
@@ -1,236 +1,226 @@ | @@ -1,236 +1,226 @@ | |||
1 | $NetBSD: patch-ac,v 1.35 2015/07/03 12:45:03 joerg Exp $ | 1 | $NetBSD: patch-ac,v 1.36 2015/08/14 12:40:19 wen Exp $ | |
2 | 2 | |||
3 | Do not include system paths in R_LD_LIBRARY_PATH. | 3 | Do not include system paths in R_LD_LIBRARY_PATH. | |
4 | FreeBSD 10 is not FreeBSD 1. | 4 | FreeBSD 10 is not FreeBSD 1. | |
5 | Fix texi2any version check. | 5 | Fix texi2any version check. | |
6 | 6 | |||
7 | --- configure.orig 2015-06-10 22:16:27.000000000 +0000 | 7 | --- configure.orig 2015-08-14 19:37:48.000000000 +0000 | |
8 | +++ configure | 8 | +++ configure | |
9 | @@ -4012,7 +4012,7 @@ fi | 9 | @@ -4012,7 +4012,7 @@ fi | |
10 | 10 | |||
11 | ## As from R 3.2.0 split up -L... and -lR | 11 | ## As from R 3.2.0 split up -L... and -lR | |
12 | if test "${want_R_shlib}" = yes; then | 12 | if test "${want_R_shlib}" = yes; then | |
13 | - LIBR0="-L\$(R_HOME)/lib\$(R_ARCH)" | 13 | - LIBR0="-L\$(R_HOME)/lib\$(R_ARCH)" | |
14 | + LIBR0="-Wl,-R${prefix}/lib/R/lib\$(R_ARCH) -L\$(R_HOME)/lib\$(R_ARCH)" | 14 | + LIBR0="-Wl,-R${prefix}/lib/R/lib\$(R_ARCH) -L\$(R_HOME)/lib\$(R_ARCH)" | |
15 | LIBR1=-lR | 15 | LIBR1=-lR | |
16 | else | 16 | else | |
17 | LIBR0= | 17 | LIBR0= | |
18 | @@ -4078,7 +4078,7 @@ fi | 18 | @@ -4078,7 +4078,7 @@ fi | |
19 | if test "x${want_lto}" != xno; then | 19 | if test "x${want_lto}" != xno; then | |
20 | LTO=-flto | 20 | LTO=-flto | |
21 | fi | 21 | fi | |
22 | -if test "x${want_lto}" == xyes; then | 22 | -if test "x${want_lto}" == xyes; then | |
23 | +if test "x${want_lto}" = xyes; then | 23 | +if test "x${want_lto}" = xyes; then | |
24 | LTOALL=-flto | 24 | LTOALL=-flto | |
25 | fi | 25 | fi | |
26 | 26 | |||
27 | @@ -5270,7 +5270,7 @@ if test -z "${texi2any_version_maj}" \ | 27 | @@ -5272,7 +5272,7 @@ if test -z "${texi2any_version_maj}" \ | |
28 | || test -z "${texi2any_version_min}"; then | 28 | elif test ${texi2any_version_maj} -gt 5; then | |
29 | r_cv_prog_texi2any_v5=no | 29 | r_cv_prog_texi2any_v5=yes | |
30 | elif test ${texi2any_version_maj} -lt 5 \ | 30 | elif test ${texi2any_version_maj} -lt 5 \ | |
31 | - || test ${texi2any_version_min} -lt 1; then | 31 | - || test ${texi2any_version_min} -lt 1; then | |
32 | + || test ${texi2any_version_maj} = 5 -a ${texi2any_version_min} -lt 1; then | 32 | + || test ${texi2any_version_maj} = 5 -a ${texi2any_version_min} -lt 1; then | |
33 | r_cv_prog_texi2any_v5=no | 33 | r_cv_prog_texi2any_v5=no | |
34 | else | 34 | else | |
35 | r_cv_prog_texi2any_v5=yes | 35 | r_cv_prog_texi2any_v5=yes | |
36 | @@ -19921,7 +19921,7 @@ dgux*) | 36 | @@ -20496,7 +20496,7 @@ case "${host_os}" in | |
37 | shlibpath_var=LD_LIBRARY_PATH | |||
38 | ;; | |||
39 | ||||
40 | -freebsd1*) | |||
41 | +freebsd1|freebsd1.*) | |||
42 | dynamic_linker=no | |||
43 | ;; | |||
44 | ||||
45 | @@ -20514,7 +20514,7 @@ case "${host_os}" in | |||
46 | ## look-up sequence. Such automatic override has proven to break things | 37 | ## look-up sequence. Such automatic override has proven to break things | |
47 | ## like system frameworks (e.g. ImageIO or OpenGL framework). | 38 | ## like system frameworks (e.g. ImageIO or OpenGL framework). | |
48 | ;; | 39 | ;; | |
49 | - *) | 40 | - *) | |
50 | + donotuse*) | 41 | + donotuse*) | |
51 | for arg in ${LDFLAGS}; do | 42 | for arg in ${LDFLAGS}; do | |
52 | case "${arg}" in | 43 | case "${arg}" in | |
53 | -L*) | 44 | -L*) | |
54 | @@ -23188,6 +23188,11 @@ fi | 45 | @@ -23170,6 +23170,11 @@ fi | |
55 | done | 46 | done | |
56 | ;; | 47 | ;; | |
57 | -[lLR]*) | 48 | -[lLR]*) | |
58 | + case $ac_arg in | 49 | + case $ac_arg in | |
59 | + -R*) | 50 | + -R*) | |
60 | + ac_arg="${wl}$ac_arg" | 51 | + ac_arg="${wl}$ac_arg" | |
61 | + ;; | 52 | + ;; | |
62 | + esac | 53 | + esac | |
63 | ac_exists=false | 54 | ac_exists=false | |
64 | for ac_i in $ac_cv_f77_libs; do | 55 | for ac_i in $ac_cv_f77_libs; do | |
65 | if test x"$ac_arg" = x"$ac_i"; then | 56 | if test x"$ac_arg" = x"$ac_i"; then | |
66 | @@ -24153,6 +24158,9 @@ cat > conftest.c <<EOF | 57 | @@ -24135,6 +24140,9 @@ cat > conftest.c <<EOF | |
67 | 58 | |||
68 | extern void F77_SYMBOL(cftest)(int *a, int *b, double *x, double *y); | 59 | extern void F77_SYMBOL(cftest)(int *a, int *b, double *x, double *y); | |
69 | 60 | |||
70 | +int MAIN_ () { return 0; } | 61 | +int MAIN_ () { return 0; } | |
71 | +int MAIN__ () { return 0; } | 62 | +int MAIN__ () { return 0; } | |
72 | + | 63 | + | |
73 | int main () { | 64 | int main () { | |
74 | int a[3] = {17, 237, 2000000000}, b[2], res = 0; | 65 | int a[3] = {17, 237, 2000000000}, b[2], res = 0; | |
75 | double x[3] = {3.14159265, 123.456789, 2.3e34}, z[3]; | 66 | double x[3] = {3.14159265, 123.456789, 2.3e34}, z[3]; | |
76 | @@ -24248,6 +24256,9 @@ typedef struct { | 67 | @@ -24230,6 +24238,9 @@ typedef struct { | |
77 | 68 | |||
78 | extern void F77_SYMBOL(cftest)(Rcomplex *x); | 69 | extern void F77_SYMBOL(cftest)(Rcomplex *x); | |
79 | 70 | |||
80 | +int MAIN_ () { return 0; } | 71 | +int MAIN_ () { return 0; } | |
81 | +int MAIN__ () { return 0; } | 72 | +int MAIN__ () { return 0; } | |
82 | + | 73 | + | |
83 | int main () { | 74 | int main () { | |
84 | Rcomplex z[3]; | 75 | Rcomplex z[3]; | |
85 | 76 | |||
86 | @@ -26452,12 +26463,12 @@ $as_echo "$as_me: WARNING: Use of flat n | 77 | @@ -26434,12 +26445,12 @@ $as_echo "$as_me: WARNING: Use of flat n | |
87 | SHLIB_LIBADD="-lcc_dynamic" | 78 | SHLIB_LIBADD="-lcc_dynamic" | |
88 | fi | 79 | fi | |
89 | ;; | 80 | ;; | |
90 | - freebsd*) | 81 | - freebsd*) | |
91 | - main_ldflags="-export-dynamic" | 82 | - main_ldflags="-export-dynamic" | |
92 | + freebsd*|dragonfly*) | 83 | + freebsd*|dragonfly*) | |
93 | + main_ldflags="${wl}-export-dynamic" | 84 | + main_ldflags="${wl}-export-dynamic" | |
94 | shlib_ldflags="-shared" | 85 | shlib_ldflags="-shared" | |
95 | ;; | 86 | ;; | |
96 | gnu*) # GNU Hurd | 87 | gnu*) # GNU Hurd | |
97 | - main_ldflags="-export-dynamic" | 88 | - main_ldflags="-export-dynamic" | |
98 | + main_ldflags="${wl}-export-dynamic" | 89 | + main_ldflags="${wl}-export-dynamic" | |
99 | ;; | 90 | ;; | |
100 | hpux*) | 91 | hpux*) | |
101 | SHLIB_EXT=".sl" | 92 | SHLIB_EXT=".sl" | |
102 | @@ -26543,8 +26554,15 @@ $as_echo "$as_me: WARNING: Use of flat n | 93 | @@ -26525,8 +26536,14 @@ $as_echo "$as_me: WARNING: Use of flat n | |
103 | fcpicflags= | 94 | fcpicflags= | |
104 | ;; | 95 | ;; | |
105 | netbsd*) | 96 | netbsd*) | |
106 | + fpicflags="-fPIC" | 97 | + fpicflags="-fPIC" | |
107 | + case "${host_cpu}" in | 98 | + case "${host_cpu}" in | |
108 | + powerpc*) | 99 | + powerpc*) | |
109 | + cpicflags="-fPIC" | 100 | + cpicflags="-fPIC" | |
110 | + ;; | 101 | + ;; | |
111 | + esac | 102 | + esac | |
112 | + | |||
113 | if ${CPP} - -dM < /dev/null | grep __ELF__ >/dev/null ; then | 103 | if ${CPP} - -dM < /dev/null | grep __ELF__ >/dev/null ; then | |
114 | - main_ldflags="-export-dynamic" | 104 | - main_ldflags="-export-dynamic" | |
115 | + main_ldflags="${wl}-export-dynamic" | 105 | + main_ldflags="${wl}-export-dynamic" | |
116 | shlib_ldflags="-shared" | 106 | shlib_ldflags="-shared" | |
117 | else | 107 | else | |
118 | shlib_ldflags="-Bshareable" | 108 | shlib_ldflags="-Bshareable" | |
119 | @@ -26566,22 +26584,22 @@ $as_echo "$as_me: WARNING: Use of flat n | 109 | @@ -26548,22 +26565,22 @@ $as_echo "$as_me: WARNING: Use of flat n | |
120 | solaris*) | 110 | solaris*) | |
121 | ## SPARC has only an 8k global object table, 1024 entries on 64-bit, | 111 | ## SPARC has only an 8k global object table, 1024 entries on 64-bit, | |
122 | ## so need PIC not pic. They are the same on other Solaris platforms. | 112 | ## so need PIC not pic. They are the same on other Solaris platforms. | |
123 | - shlib_ldflags="-G" | 113 | - shlib_ldflags="-G" | |
124 | - shlib_cxxldflags="-G" | 114 | - shlib_cxxldflags="-G" | |
125 | if test "${GCC}" = yes; then | 115 | if test "${GCC}" = yes; then | |
126 | + shlib_ldflags="-shared" | 116 | + shlib_ldflags="-shared" | |
127 | + shlib_cxxldflags="-shared" | 117 | + shlib_cxxldflags="-shared" | |
128 | cpicflags="-fPIC" | 118 | cpicflags="-fPIC" | |
129 | ld=`${CC} -print-prog-name=ld` | 119 | ld=`${CC} -print-prog-name=ld` | |
130 | ldoutput=`${ld} -v 2>&1 | grep GNU` | 120 | ldoutput=`${ld} -v 2>&1 | grep GNU` | |
131 | if test -n "${ldoutput}"; then | 121 | if test -n "${ldoutput}"; then | |
132 | main_ldflags="-Wl,-export-dynamic" | 122 | main_ldflags="-Wl,-export-dynamic" | |
133 | - shlib_ldflags="-shared" | 123 | - shlib_ldflags="-shared" | |
134 | - shlib_cxxldflags="-shared" | 124 | - shlib_cxxldflags="-shared" | |
135 | else | 125 | else | |
136 | ## it seems gcc c 4.6.2 needs this with Solaris linker | 126 | ## it seems gcc c 4.6.2 needs this with Solaris linker | |
137 | shlib_ldflags="-shared" | 127 | shlib_ldflags="-shared" | |
138 | shlib_cxxldflags="-shared" | 128 | shlib_cxxldflags="-shared" | |
139 | fi | 129 | fi | |
140 | else | 130 | else | |
141 | + shlib_ldflags="-G" | 131 | + shlib_ldflags="-G" | |
142 | + shlib_cxxldflags="-G" | 132 | + shlib_cxxldflags="-G" | |
143 | cpicflags="-KPIC" | 133 | cpicflags="-KPIC" | |
144 | if test "`basename ${CXX}`" = "CC" ; then | 134 | if test "`basename ${CXX}`" = "CC" ; then | |
145 | ## Forte version 7 needs -lCstd: Forte 6 does not. | 135 | ## Forte version 7 needs -lCstd: Forte 6 does not. | |
146 | @@ -26642,7 +26660,7 @@ fi | 136 | @@ -26624,7 +26641,7 @@ fi | |
147 | : ${CPICFLAGS="${cpicflags}"} | 137 | : ${CPICFLAGS="${cpicflags}"} | |
148 | if test -z "${CPICFLAGS}"; then | 138 | if test -z "${CPICFLAGS}"; then | |
149 | case "${host_os}" in | 139 | case "${host_os}" in | |
150 | - aix*|cygwin*|irix*|mingw*|osf*) | 140 | - aix*|cygwin*|irix*|mingw*|osf*) | |
151 | + aix*|cygwin*|irix*|mingw*|osf*|darwin*) | 141 | + aix*|cygwin*|irix*|mingw*|osf*|darwin*) | |
152 | ;; | 142 | ;; | |
153 | *) | 143 | *) | |
154 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: I could not determine CPICFLAGS." >&5 | 144 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: I could not determine CPICFLAGS." >&5 | |
155 | @@ -27338,6 +27356,14 @@ _ACEOF | 145 | @@ -27320,6 +27337,14 @@ _ACEOF | |
156 | ## Cygwin has rintl but not nearbyintl | 146 | ## Cygwin has rintl but not nearbyintl | |
157 | for ac_func in expm1 hypot log1p log1pl log2 log10 nearbyint nearbyintl powl rint rintl | 147 | for ac_func in expm1 hypot log1p log1pl log2 log10 nearbyint nearbyintl powl rint rintl | |
158 | do | 148 | do | |
159 | +case $ac_func in | 149 | +case $ac_func in | |
160 | +expm1|log1p|log2|log10|nearbyint|nearbyintl|rint|rintl) | 150 | +expm1|log1p|log2|log10|nearbyint|nearbyintl|rint|rintl) | |
161 | + args="x" | 151 | + args="x" | |
162 | + ;; | 152 | + ;; | |
163 | +hypot|powl) | 153 | +hypot|powl) | |
164 | + args="x,x" | 154 | + args="x,x" | |
165 | + ;; | 155 | + ;; | |
166 | +esac | 156 | +esac | |
167 | as_ac_Symbol=`$as_echo "ac_cv_have_decl_$ac_func" | $as_tr_sh` | 157 | as_ac_Symbol=`$as_echo "ac_cv_have_decl_$ac_func" | $as_tr_sh` | |
168 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $ac_func exists and is declared" >&5 | 158 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $ac_func exists and is declared" >&5 | |
169 | $as_echo_n "checking whether $ac_func exists and is declared... " >&6; } | 159 | $as_echo_n "checking whether $ac_func exists and is declared... " >&6; } | |
170 | @@ -27347,24 +27373,12 @@ else | 160 | @@ -27329,24 +27354,12 @@ else | |
171 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | 161 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | |
172 | /* end confdefs.h. */ | 162 | /* end confdefs.h. */ | |
173 | #include <math.h> | 163 | #include <math.h> | |
174 | +volatile long double x; | 164 | +volatile long double x; | |
175 | 165 | |||
176 | -#ifdef F77_DUMMY_MAIN | 166 | -#ifdef F77_DUMMY_MAIN | |
177 | - | 167 | - | |
178 | -# ifdef __cplusplus | 168 | -# ifdef __cplusplus | |
179 | - extern "C" | 169 | - extern "C" | |
180 | -# endif | 170 | -# endif | |
181 | - int F77_DUMMY_MAIN() { return 1; } | 171 | - int F77_DUMMY_MAIN() { return 1; } | |
182 | - | 172 | - | |
183 | -#endif | 173 | -#endif | |
184 | int | 174 | int | |
185 | main () | 175 | main () | |
186 | { | 176 | { | |
187 | -#ifndef $ac_func | 177 | -#ifndef $ac_func | |
188 | - char *p = (char *) $ac_func; | 178 | - char *p = (char *) $ac_func; | |
189 | -#endif | 179 | -#endif | |
190 | - | 180 | - | |
191 | - ; | 181 | - ; | |
192 | - return 0; | 182 | - return 0; | |
193 | + return $ac_func($args); | 183 | + return $ac_func($args);; | |
194 | } | 184 | } | |
195 | _ACEOF | 185 | _ACEOF | |
196 | if ac_fn_c_try_link "$LINENO"; then : | 186 | if ac_fn_c_try_link "$LINENO"; then : | |
197 | @@ -30274,6 +30288,15 @@ cat > conftest.c <<EOF | 187 | @@ -30256,6 +30269,15 @@ cat > conftest.c <<EOF | |
198 | #endif | 188 | #endif | |
199 | extern void F77_SYMBOL(test1)(int *iflag); | 189 | extern void F77_SYMBOL(test1)(int *iflag); | |
200 | 190 | |||
201 | +#ifdef F77_DUMMY_MAIN | 191 | +#ifdef F77_DUMMY_MAIN | |
202 | + | 192 | + | |
203 | +# ifdef __cplusplus | 193 | +# ifdef __cplusplus | |
204 | + extern "C" | 194 | + extern "C" | |
205 | +# endif | 195 | +# endif | |
206 | + int F77_DUMMY_MAIN() { return 1; } | 196 | + int F77_DUMMY_MAIN() { return 1; } | |
207 | + | 197 | + | |
208 | +#endif | 198 | +#endif | |
209 | + | 199 | + | |
210 | int main () { | 200 | int main () { | |
211 | int iflag; | 201 | int iflag; | |
212 | F77_SYMBOL(test1)(&iflag); | 202 | F77_SYMBOL(test1)(&iflag); | |
213 | @@ -30338,6 +30361,14 @@ else | 203 | @@ -30320,6 +30342,14 @@ else | |
214 | #else | 204 | #else | |
215 | # define F77_SYMBOL(x) x | 205 | # define F77_SYMBOL(x) x | |
216 | #endif | 206 | #endif | |
217 | +#ifdef F77_DUMMY_MAIN | 207 | +#ifdef F77_DUMMY_MAIN | |
218 | + | 208 | + | |
219 | +# ifdef __cplusplus | 209 | +# ifdef __cplusplus | |
220 | + extern "C" | 210 | + extern "C" | |
221 | +# endif | 211 | +# endif | |
222 | + int F77_DUMMY_MAIN() { return 1; } | 212 | + int F77_DUMMY_MAIN() { return 1; } | |
223 | + | 213 | + | |
224 | +#endif | 214 | +#endif | |
225 | void F77_SYMBOL(xerbla)(char *srname, int *info) | 215 | void F77_SYMBOL(xerbla)(char *srname, int *info) | |
226 | {} | 216 | {} | |
227 | void blas_set () { | 217 | void blas_set () { | |
228 | @@ -38953,7 +38984,7 @@ case "${host_os}" in | 218 | @@ -38927,7 +38957,7 @@ case "${host_os}" in | |
229 | r_ld_library_defaults="/usr/lib64:/lib64:/usr/lib:/lib" | 219 | r_ld_library_defaults="/usr/lib64:/lib64:/usr/lib:/lib" | |
230 | ;; | 220 | ;; | |
231 | solaris*) | 221 | solaris*) | |
232 | - r_ld_library_defaults="/usr/lib:/lib" | 222 | - r_ld_library_defaults="/usr/lib:/lib" | |
233 | + r_ld_library_defaults="/usr/lib:/lib:/usr/lib/amd64:/lib/amd64:/usr/lib/64:/lib/64" | 223 | + r_ld_library_defaults="/usr/lib:/lib:/usr/lib/amd64:/lib/amd64:/usr/lib/64:/lib/64" | |
234 | ;; | 224 | ;; | |
235 | darwin*) | 225 | darwin*) | |
236 | r_ld_library_defaults="/usr/X11R6/lib" | 226 | r_ld_library_defaults="/usr/X11R6/lib" |