pkgsrc-Users archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Update of math/R in pkgsrc
Hi,
Here is a patch for math/R, which include :
1 update to 3.4.1
2 rename patch-ac to patch-configure
3 use gfortran instead of g95 to compile the package
Any suggestions ?
Regards,
wen
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/math/R/Makefile,v
retrieving revision 1.173
diff -u -p -r1.173 Makefile
--- Makefile 30 Apr 2017 01:21:49 -0000 1.173
+++ Makefile 27 Jul 2017 08:38:38 -0000
@@ -1,7 +1,6 @@
# $NetBSD: Makefile,v 1.173 2017/04/30 01:21:49 ryoon Exp $
-DISTNAME= R-3.3.3
-PKGREVISION= 1
+DISTNAME= R-3.4.1
CATEGORIES= math
MASTER_SITES= ${MASTER_SITE_R_CRAN:=base/R-3/}
@@ -22,6 +21,7 @@ TEST_TARGET= check
USE_TOOLS+= gmake gzip:run makeinfo perl:run sed unzip:run xmkmf
USE_TOOLS+= pkg-config
USE_LANGUAGES= c c++ fortran
+PKGSRC_FORTRAN= gfortran
USE_LIBTOOL= yes
TEXINFO_REQD= 5.1
INFO_FILES= yes
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/math/R/PLIST,v
retrieving revision 1.26
diff -u -p -r1.26 PLIST
--- PLIST 11 Mar 2017 09:50:34 -0000 1.26
+++ PLIST 27 Jul 2017 08:38:38 -0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.26 2017/03/11 09:50:34 wen Exp $
+@comment $NetBSD$
bin/R
bin/Rscript
info/R-FAQ.info.gz
@@ -133,6 +133,7 @@ lib/R/lib/libRlapack.so
lib/R/library/KernSmooth/DESCRIPTION
lib/R/library/KernSmooth/INDEX
lib/R/library/KernSmooth/Meta/Rd.rds
+lib/R/library/KernSmooth/Meta/features.rds
lib/R/library/KernSmooth/Meta/hsearch.rds
lib/R/library/KernSmooth/Meta/links.rds
lib/R/library/KernSmooth/Meta/nsInfo.rds
@@ -159,6 +160,7 @@ lib/R/library/MASS/DESCRIPTION
lib/R/library/MASS/INDEX
lib/R/library/MASS/Meta/Rd.rds
lib/R/library/MASS/Meta/data.rds
+lib/R/library/MASS/Meta/features.rds
lib/R/library/MASS/Meta/hsearch.rds
lib/R/library/MASS/Meta/links.rds
lib/R/library/MASS/Meta/nsInfo.rds
@@ -207,6 +209,7 @@ lib/R/library/Matrix/INDEX
lib/R/library/Matrix/LICENCE
lib/R/library/Matrix/Meta/Rd.rds
lib/R/library/Matrix/Meta/data.rds
+lib/R/library/Matrix/Meta/features.rds
lib/R/library/Matrix/Meta/hsearch.rds
lib/R/library/Matrix/Meta/links.rds
lib/R/library/Matrix/Meta/nsInfo.rds
@@ -282,6 +285,7 @@ lib/R/library/base/DESCRIPTION
lib/R/library/base/INDEX
lib/R/library/base/Meta/Rd.rds
lib/R/library/base/Meta/demo.rds
+lib/R/library/base/Meta/features.rds
lib/R/library/base/Meta/hsearch.rds
lib/R/library/base/Meta/links.rds
lib/R/library/base/Meta/package.rds
@@ -305,6 +309,7 @@ lib/R/library/boot/DESCRIPTION
lib/R/library/boot/INDEX
lib/R/library/boot/Meta/Rd.rds
lib/R/library/boot/Meta/data.rds
+lib/R/library/boot/Meta/features.rds
lib/R/library/boot/Meta/hsearch.rds
lib/R/library/boot/Meta/links.rds
lib/R/library/boot/Meta/nsInfo.rds
@@ -334,6 +339,7 @@ lib/R/library/class/CITATION
lib/R/library/class/DESCRIPTION
lib/R/library/class/INDEX
lib/R/library/class/Meta/Rd.rds
+lib/R/library/class/Meta/features.rds
lib/R/library/class/Meta/hsearch.rds
lib/R/library/class/Meta/links.rds
lib/R/library/class/Meta/nsInfo.rds
@@ -361,6 +367,7 @@ lib/R/library/cluster/DESCRIPTION
lib/R/library/cluster/INDEX
lib/R/library/cluster/Meta/Rd.rds
lib/R/library/cluster/Meta/data.rds
+lib/R/library/cluster/Meta/features.rds
lib/R/library/cluster/Meta/hsearch.rds
lib/R/library/cluster/Meta/links.rds
lib/R/library/cluster/Meta/nsInfo.rds
@@ -392,6 +399,7 @@ lib/R/library/cluster/po/pl/LC_MESSAGES/
lib/R/library/codetools/DESCRIPTION
lib/R/library/codetools/INDEX
lib/R/library/codetools/Meta/Rd.rds
+lib/R/library/codetools/Meta/features.rds
lib/R/library/codetools/Meta/hsearch.rds
lib/R/library/codetools/Meta/links.rds
lib/R/library/codetools/Meta/nsInfo.rds
@@ -410,6 +418,7 @@ lib/R/library/codetools/html/R.css
lib/R/library/compiler/DESCRIPTION
lib/R/library/compiler/INDEX
lib/R/library/compiler/Meta/Rd.rds
+lib/R/library/compiler/Meta/features.rds
lib/R/library/compiler/Meta/hsearch.rds
lib/R/library/compiler/Meta/links.rds
lib/R/library/compiler/Meta/nsInfo.rds
@@ -429,6 +438,7 @@ lib/R/library/datasets/DESCRIPTION
lib/R/library/datasets/INDEX
lib/R/library/datasets/Meta/Rd.rds
lib/R/library/datasets/Meta/data.rds
+lib/R/library/datasets/Meta/features.rds
lib/R/library/datasets/Meta/hsearch.rds
lib/R/library/datasets/Meta/links.rds
lib/R/library/datasets/Meta/nsInfo.rds
@@ -449,6 +459,7 @@ lib/R/library/foreign/COPYRIGHTS
lib/R/library/foreign/DESCRIPTION
lib/R/library/foreign/INDEX
lib/R/library/foreign/Meta/Rd.rds
+lib/R/library/foreign/Meta/features.rds
lib/R/library/foreign/Meta/hsearch.rds
lib/R/library/foreign/Meta/links.rds
lib/R/library/foreign/Meta/nsInfo.rds
@@ -459,7 +470,9 @@ lib/R/library/foreign/R/foreign.rdb
lib/R/library/foreign/R/foreign.rdx
lib/R/library/foreign/files/HillRace.SYD
lib/R/library/foreign/files/Iris.syd
+lib/R/library/foreign/files/electric.sav
lib/R/library/foreign/files/sids.dbf
+lib/R/library/foreign/files/testdata.sav
lib/R/library/foreign/help/AnIndex
lib/R/library/foreign/help/aliases.rds
lib/R/library/foreign/help/foreign.rdb
@@ -480,6 +493,7 @@ lib/R/library/grDevices/DESCRIPTION
lib/R/library/grDevices/INDEX
lib/R/library/grDevices/Meta/Rd.rds
lib/R/library/grDevices/Meta/demo.rds
+lib/R/library/grDevices/Meta/features.rds
lib/R/library/grDevices/Meta/hsearch.rds
lib/R/library/grDevices/Meta/links.rds
lib/R/library/grDevices/Meta/nsInfo.rds
@@ -616,6 +630,7 @@ lib/R/library/graphics/DESCRIPTION
lib/R/library/graphics/INDEX
lib/R/library/graphics/Meta/Rd.rds
lib/R/library/graphics/Meta/demo.rds
+lib/R/library/graphics/Meta/features.rds
lib/R/library/graphics/Meta/hsearch.rds
lib/R/library/graphics/Meta/links.rds
lib/R/library/graphics/Meta/nsInfo.rds
@@ -648,6 +663,7 @@ lib/R/library/graphics/libs/graphics.so
lib/R/library/grid/DESCRIPTION
lib/R/library/grid/INDEX
lib/R/library/grid/Meta/Rd.rds
+lib/R/library/grid/Meta/features.rds
lib/R/library/grid/Meta/hsearch.rds
lib/R/library/grid/Meta/links.rds
lib/R/library/grid/Meta/nsInfo.rds
@@ -685,6 +701,7 @@ lib/R/library/lattice/INDEX
lib/R/library/lattice/Meta/Rd.rds
lib/R/library/lattice/Meta/data.rds
lib/R/library/lattice/Meta/demo.rds
+lib/R/library/lattice/Meta/features.rds
lib/R/library/lattice/Meta/hsearch.rds
lib/R/library/lattice/Meta/links.rds
lib/R/library/lattice/Meta/nsInfo.rds
@@ -717,6 +734,7 @@ lib/R/library/lattice/po/pl/LC_MESSAGES/
lib/R/library/methods/DESCRIPTION
lib/R/library/methods/INDEX
lib/R/library/methods/Meta/Rd.rds
+lib/R/library/methods/Meta/features.rds
lib/R/library/methods/Meta/hsearch.rds
lib/R/library/methods/Meta/links.rds
lib/R/library/methods/Meta/nsInfo.rds
@@ -738,6 +756,7 @@ lib/R/library/mgcv/DESCRIPTION
lib/R/library/mgcv/INDEX
lib/R/library/mgcv/Meta/Rd.rds
lib/R/library/mgcv/Meta/data.rds
+lib/R/library/mgcv/Meta/features.rds
lib/R/library/mgcv/Meta/hsearch.rds
lib/R/library/mgcv/Meta/links.rds
lib/R/library/mgcv/Meta/nsInfo.rds
@@ -772,6 +791,7 @@ lib/R/library/nlme/INDEX
lib/R/library/nlme/LICENCE
lib/R/library/nlme/Meta/Rd.rds
lib/R/library/nlme/Meta/data.rds
+lib/R/library/nlme/Meta/features.rds
lib/R/library/nlme/Meta/hsearch.rds
lib/R/library/nlme/Meta/links.rds
lib/R/library/nlme/Meta/nsInfo.rds
@@ -817,6 +837,7 @@ lib/R/library/nnet/CITATION
lib/R/library/nnet/DESCRIPTION
lib/R/library/nnet/INDEX
lib/R/library/nnet/Meta/Rd.rds
+lib/R/library/nnet/Meta/features.rds
lib/R/library/nnet/Meta/hsearch.rds
lib/R/library/nnet/Meta/links.rds
lib/R/library/nnet/Meta/nsInfo.rds
@@ -842,6 +863,7 @@ lib/R/library/nnet/po/pl/LC_MESSAGES/R-n
lib/R/library/parallel/DESCRIPTION
lib/R/library/parallel/INDEX
lib/R/library/parallel/Meta/Rd.rds
+lib/R/library/parallel/Meta/features.rds
lib/R/library/parallel/Meta/hsearch.rds
lib/R/library/parallel/Meta/links.rds
lib/R/library/parallel/Meta/nsInfo.rds
@@ -863,6 +885,7 @@ lib/R/library/rpart/DESCRIPTION
lib/R/library/rpart/INDEX
lib/R/library/rpart/Meta/Rd.rds
lib/R/library/rpart/Meta/data.rds
+lib/R/library/rpart/Meta/features.rds
lib/R/library/rpart/Meta/hsearch.rds
lib/R/library/rpart/Meta/links.rds
lib/R/library/rpart/Meta/nsInfo.rds
@@ -907,6 +930,7 @@ lib/R/library/spatial/CITATION
lib/R/library/spatial/DESCRIPTION
lib/R/library/spatial/INDEX
lib/R/library/spatial/Meta/Rd.rds
+lib/R/library/spatial/Meta/features.rds
lib/R/library/spatial/Meta/hsearch.rds
lib/R/library/spatial/Meta/links.rds
lib/R/library/spatial/Meta/nsInfo.rds
@@ -957,6 +981,7 @@ lib/R/library/spatial/ppdata/towns.dat
lib/R/library/splines/DESCRIPTION
lib/R/library/splines/INDEX
lib/R/library/splines/Meta/Rd.rds
+lib/R/library/splines/Meta/features.rds
lib/R/library/splines/Meta/hsearch.rds
lib/R/library/splines/Meta/links.rds
lib/R/library/splines/Meta/nsInfo.rds
@@ -978,6 +1003,7 @@ lib/R/library/stats/DESCRIPTION
lib/R/library/stats/INDEX
lib/R/library/stats/Meta/Rd.rds
lib/R/library/stats/Meta/demo.rds
+lib/R/library/stats/Meta/features.rds
lib/R/library/stats/Meta/hsearch.rds
lib/R/library/stats/Meta/links.rds
lib/R/library/stats/Meta/nsInfo.rds
@@ -1002,6 +1028,7 @@ lib/R/library/stats/libs/stats.so
lib/R/library/stats4/DESCRIPTION
lib/R/library/stats4/INDEX
lib/R/library/stats4/Meta/Rd.rds
+lib/R/library/stats4/Meta/features.rds
lib/R/library/stats4/Meta/hsearch.rds
lib/R/library/stats4/Meta/links.rds
lib/R/library/stats4/Meta/nsInfo.rds
@@ -1023,6 +1050,7 @@ lib/R/library/survival/DESCRIPTION
lib/R/library/survival/INDEX
lib/R/library/survival/Meta/Rd.rds
lib/R/library/survival/Meta/data.rds
+lib/R/library/survival/Meta/features.rds
lib/R/library/survival/Meta/hsearch.rds
lib/R/library/survival/Meta/links.rds
lib/R/library/survival/Meta/nsInfo.rds
@@ -1053,6 +1081,9 @@ lib/R/library/survival/doc/splines.pdf
lib/R/library/survival/doc/tests.R
lib/R/library/survival/doc/tests.Rnw
lib/R/library/survival/doc/tests.pdf
+lib/R/library/survival/doc/tiedtimes.R
+lib/R/library/survival/doc/tiedtimes.Rnw
+lib/R/library/survival/doc/tiedtimes.pdf
lib/R/library/survival/doc/timedep.R
lib/R/library/survival/doc/timedep.Rnw
lib/R/library/survival/doc/timedep.pdf
@@ -1071,6 +1102,7 @@ lib/R/library/tcltk/DESCRIPTION
lib/R/library/tcltk/INDEX
lib/R/library/tcltk/Meta/Rd.rds
lib/R/library/tcltk/Meta/demo.rds
+lib/R/library/tcltk/Meta/features.rds
lib/R/library/tcltk/Meta/hsearch.rds
lib/R/library/tcltk/Meta/links.rds
lib/R/library/tcltk/Meta/nsInfo.rds
@@ -1106,6 +1138,7 @@ lib/R/library/tcltk/libs/tcltk.so
lib/R/library/tools/DESCRIPTION
lib/R/library/tools/INDEX
lib/R/library/tools/Meta/Rd.rds
+lib/R/library/tools/Meta/features.rds
lib/R/library/tools/Meta/hsearch.rds
lib/R/library/tools/Meta/links.rds
lib/R/library/tools/Meta/nsInfo.rds
@@ -1407,6 +1440,7 @@ lib/R/library/translations/zh_TW/LC_MESS
lib/R/library/utils/DESCRIPTION
lib/R/library/utils/INDEX
lib/R/library/utils/Meta/Rd.rds
+lib/R/library/utils/Meta/features.rds
lib/R/library/utils/Meta/hsearch.rds
lib/R/library/utils/Meta/links.rds
lib/R/library/utils/Meta/nsInfo.rds
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/math/R/distinfo,v
retrieving revision 1.75
diff -u -p -r1.75 distinfo
--- distinfo 11 Mar 2017 09:50:34 -0000 1.75
+++ distinfo 27 Jul 2017 08:38:38 -0000
@@ -1,11 +1,11 @@
$NetBSD: distinfo,v 1.75 2017/03/11 09:50:34 wen Exp $
-SHA1 (R-3.3.3.tar.gz) = 9e205a817970578ecd80384f397bae35b46f13b9
-RMD160 (R-3.3.3.tar.gz) = 5f0d3aa3cf26132ac8774d2589083a12493c18ad
-SHA512 (R-3.3.3.tar.gz) = bcb0d92fc0b22c13e345a2f660e3b3cc5810f6a07c8f2e37949c81308c2b8a5edc322df0394ece563888645442b6c01a3e1e7005aa60bd9beacc718200829e75
-Size (R-3.3.3.tar.gz) = 29804326 bytes
-SHA1 (patch-ac) = 68c1943a352e6f8b2842331578ed746b1ac27bea
+SHA1 (R-3.4.1.tar.gz) = 7ce8abccf61f3dc39c40f474060f2c8f00004d62
+RMD160 (R-3.4.1.tar.gz) = 514ea44803ae79650228874d58c036f914d3b2b2
+SHA512 (R-3.4.1.tar.gz) = 19bd50c87dc001ef947c15c1760f27ac8986ff6b43c6d90d3093ae184e42963027ef06faf31ec57ac9e519af7a35a2f53f8ea23ef75d800ebbd02945cedc4651
+Size (R-3.4.1.tar.gz) = 30200109 bytes
SHA1 (patch-ad) = a43b4875a2ee4677b5f762abf3f9a623fd12cbb5
+SHA1 (patch-configure) = 4a2f365b849a1408613b662358b9a24938bb4390
SHA1 (patch-src_include_GraphicsBase.h) = eed25eaca982ca76bf75d199dd8bf48be2a99ac5
SHA1 (patch-src_library_stats_src_Makefile.in) = 4eb93292858392792c37a706399e2cef91821bbe
SHA1 (patch-src_main_character.c) = 1271cbd68ec57e28cf6a394398d21d6a18b6760b
Index: patches/patch-ac
===================================================================
RCS file: patches/patch-ac
diff -N patches/patch-ac
--- patches/patch-ac 26 Jul 2016 04:53:33 -0000 1.39
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,221 +0,0 @@
-$NetBSD: patch-ac,v 1.39 2016/07/26 04:53:33 wen Exp $
-
-Do not include system paths in R_LD_LIBRARY_PATH.
-FreeBSD 10 is not FreeBSD 1.
-Fix texi2any version check.
-
---- configure.orig 2016-07-26 00:32:06.000000000 +0000
-+++ configure
-@@ -3896,7 +3896,7 @@ fi
-
- ## As from R 3.2.0 split up -L... and -lR
- if test "${want_R_shlib}" = yes; then
-- LIBR0="-L\$(R_HOME)/lib\$(R_ARCH)"
-+ LIBR0="-Wl,-R${prefix}/lib/R/lib\$(R_ARCH) -L\$(R_HOME)/lib\$(R_ARCH)"
- LIBR1=-lR
- else
- LIBR0=
-@@ -5076,7 +5076,7 @@ if test -z "${texi2any_version_maj}" \
- elif test ${texi2any_version_maj} -gt 5; then
- r_cv_prog_texi2any_v5=yes
- elif test ${texi2any_version_maj} -lt 5 \
-- || test ${texi2any_version_min} -lt 1; then
-+ || test ${texi2any_version_maj} = 5 -a ${texi2any_version_min} -lt 1; then
- r_cv_prog_texi2any_v5=no
- else
- r_cv_prog_texi2any_v5=yes
-@@ -22376,7 +22376,7 @@ case "${host_os}" in
- ## Not so bad in later versions of Darwin,
- ## where DYLD_FALLBACK_LIBRARY_PATH is used (see below).
- ;;
-- *)
-+ donotuse*)
- for arg in ${LDFLAGS}; do
- case "${arg}" in
- -L*)
-@@ -24958,6 +24958,11 @@ fi
- done
- ;;
- -[lLR]*)
-+ case $ac_arg in
-+ -R*)
-+ ac_arg="${wl}$ac_arg"
-+ ;;
-+ esac
- ac_exists=false
- for ac_i in $ac_cv_f77_libs; do
- if test x"$ac_arg" = x"$ac_i"; then
-@@ -25923,6 +25928,9 @@ cat > conftest.c <<EOF
-
- extern void F77_SYMBOL(cftest)(int *a, int *b, double *x, double *y);
-
-+int MAIN_ () { return 0; }
-+int MAIN__ () { return 0; }
-+
- int main () {
- int a[3] = {17, 237, 2000000000}, b[2], res = 0;
- double x[3] = {3.14159265, 123.456789, 2.3e34}, z[3];
-@@ -26018,6 +26026,9 @@ typedef struct {
-
- extern void F77_SYMBOL(cftest)(Rcomplex *x);
-
-+int MAIN_ () { return 0; }
-+int MAIN__ () { return 0; }
-+
- int main () {
- Rcomplex z[3];
-
-@@ -28175,7 +28186,7 @@ $as_echo "$as_me: WARNING: Use of flat n
- fpicflags="${darwin_pic}"
- shlib_cxxldflags="${shlib_ldflags}"
- ;;
-- freebsd*)
-+ freebsd*|dragonfly*)
- ## maybe this needs to depend on the compiler:
- ## -export-dynamic used to work, but does not with clang.
- ## Seems FreeBSD has used the GNU linker since at least 3.0 (Oct 1998)
-@@ -28271,6 +28282,12 @@ $as_echo "$as_me: WARNING: Use of flat n
- ;;
- netbsd*)
- ## See the comments about FreeBSD
-+ fpicflags="-fPIC"
-+ case "${host_cpu}" in
-+ powerpc*)
-+ cpicflags="-fPIC"
-+ ;;
-+ esac
- if ${CPP} - -dM < /dev/null | grep __ELF__ >/dev/null ; then
- main_ldflags="-Wl,--export-dynamic"
- shlib_ldflags="-shared"
-@@ -28313,22 +28330,22 @@ $as_echo "$as_me: WARNING: Use of flat n
- solaris*)
- ## SPARC has only an 8k global object table, 1024 entries on 64-bit,
- ## so need PIC not pic. They are the same on other Solaris platforms.
-- shlib_ldflags="-G"
-- shlib_cxxldflags="-G"
- if test "${GCC}" = yes; then
-+ shlib_ldflags="-shared"
-+ shlib_cxxldflags="-shared"
- cpicflags="-fPIC"
- ld=`${CC} -print-prog-name=ld`
- ldoutput=`${ld} -v 2>&1 | grep GNU`
- if test -n "${ldoutput}"; then
- main_ldflags="-Wl,-export-dynamic"
-- shlib_ldflags="-shared"
-- shlib_cxxldflags="-shared"
- else
- ## it seems gcc c 4.6.2 needs this with Solaris linker
- shlib_ldflags="-shared"
- shlib_cxxldflags="-shared"
- fi
- else
-+ shlib_ldflags="-G"
-+ shlib_cxxldflags="-G"
- cpicflags="-KPIC"
- if test "`basename ${CXX}`" = "CC" ; then
- ## Forte version 7 needs -lCstd: Forte 6 does not.
-@@ -28389,7 +28406,7 @@ fi
- : ${CPICFLAGS="${cpicflags}"}
- if test -z "${CPICFLAGS}"; then
- case "${host_os}" in
-- aix*|irix*|mingw*|osf*)
-+ aix*|irix*|mingw*|osf*|darwin*)
- ;;
- *)
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: I could not determine CPICFLAGS." >&5
-@@ -28489,10 +28506,10 @@ case "${host_os}" in
- DYLIB_EXT=".dylib"
- dylib_ldflags="${darwin_dylib_ldflags}"
- MAJR_VERSION=`echo "${PACKAGE_VERSION}" | sed -e "s/[\.][1-9]$/.0/"`
-- LIBR_LDFLAGS="-install_name libR.dylib -compatibility_version ${MAJR_VERSION} -current_version ${PACKAGE_VERSION} -headerpad_max_install_names"
-- RLAPACK_LDFLAGS="-install_name libRlapack.dylib -compatibility_version ${MAJR_VERSION} -current_version ${PACKAGE_VERSION} -headerpad_max_install_names"
-+ LIBR_LDFLAGS="-install_name ${PREFIX}/lib/R/lib/libR.dylib -compatibility_version ${MAJR_VERSION} -current_version ${PACKAGE_VERSION} -headerpad_max_install_names"
-+ RLAPACK_LDFLAGS="-install_name ${PREFIX}/lib/R/lib/libRlapack.dylib -compatibility_version ${MAJR_VERSION} -current_version ${PACKAGE_VERSION} -headerpad_max_install_names"
- ## don't use version in libRblas so we can replace it with any BLAS implementation
-- RBLAS_LDFLAGS="-install_name libRblas.dylib -headerpad_max_install_names"
-+ RBLAS_LDFLAGS="-install_name ${PREFIX}/lib/R/lib/libRblas.dylib -headerpad_max_install_names"
- ;;
- hpux*)
- ## Needs to avoid embedding a relative path ../../../bin.
-@@ -29106,6 +29123,14 @@ _ACEOF
- ## Cygwin had rintl but not nearbyintl
- for ac_func in expm1 hypot log1p log1pl log2 log10 nearbyint nearbyintl powl rint rintl
- do
-+case $ac_func in
-+expm1|log1p|log2|log10|nearbyint|nearbyintl|rint|rintl)
-+ args="x"
-+ ;;
-+hypot|powl)
-+ args="x,x"
-+ ;;
-+esac
- as_ac_Symbol=`$as_echo "ac_cv_have_decl_$ac_func" | $as_tr_sh`
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $ac_func exists and is declared" >&5
- $as_echo_n "checking whether $ac_func exists and is declared... " >&6; }
-@@ -29115,24 +29140,12 @@ else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
- #include <math.h>
-+volatile long double x;
-
--#ifdef F77_DUMMY_MAIN
--
--# ifdef __cplusplus
-- extern "C"
--# endif
-- int F77_DUMMY_MAIN() { return 1; }
--
--#endif
- int
- main ()
- {
--#ifndef $ac_func
-- char *p = (char *) $ac_func;
--#endif
--
-- ;
-- return 0;
-+ return $ac_func($args);;;
- }
- _ACEOF
- if ac_fn_c_try_link "$LINENO"; then :
-@@ -32092,6 +32105,14 @@ cat > conftest.c <<EOF
- # define F77_SYMBOL(x) x
- #endif
- extern void F77_SYMBOL(test1)(int *iflag);
-+ifdef F77_DUMMY_MAIN
-+
-+# ifdef __cplusplus
-+ extern "C"
-+# endif
-+ int F77_DUMMY_MAIN() { return 1; }
-+
-+#endif
-
- int main () {
- int iflag;
-@@ -32157,6 +32178,15 @@ else
- #else
- # define F77_SYMBOL(x) x
- #endif
-+#ifdef F77_DUMMY_MAIN
-+
-+# ifdef __cplusplus
-+ extern "C"
-+# endif
-+ int F77_DUMMY_MAIN() { return 1; }
-+
-+#endif
-+
- void F77_SYMBOL(xerbla)(char *srname, int *info)
- {}
- void blas_set () {
-@@ -41516,7 +41546,7 @@ case "${host_os}" in
- r_ld_library_defaults="/usr/lib64:/lib64:/usr/lib:/lib"
- ;;
- solaris*)
-- r_ld_library_defaults="/usr/lib:/lib"
-+ r_ld_library_defaults="/usr/lib:/lib:/usr/lib/amd64:/lib/amd64:/usr/lib/64:/lib/64"
- ;;
- *)
- r_ld_library_defaults=
Index: patches/patch-configure
===================================================================
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-configure 27 Jul 2017 08:38:38 -0000
@@ -0,0 +1,211 @@
+$NetBSD$
+
+Do not include system paths in R_LD_LIBRARY_PATH.
+Fix texi2any version check.
+
+--- configure.orig 2017-05-22 13:14:53.000000000 +0000
++++ configure
+@@ -3974,7 +3974,7 @@ fi
+
+ ## As from R 3.2.0 split up -L... and -lR
+ if test "${want_R_shlib}" = yes; then
+- LIBR0="-L\$(R_HOME)/lib\$(R_ARCH)"
++ LIBR0="-Wl,-R${prefix}/lib/R/lib\$(R_ARCH) -L\$(R_HOME)/lib\$(R_ARCH)"
+ LIBR1=-lR
+ else
+ LIBR0=
+@@ -5154,7 +5154,7 @@ if test -z "${texi2any_version_maj}" \
+ elif test ${texi2any_version_maj} -gt 5; then
+ r_cv_prog_texi2any_v5=yes
+ elif test ${texi2any_version_maj} -lt 5 \
+- || test ${texi2any_version_min} -lt 1; then
++ || test ${texi2any_version_maj} = 5 -a ${texi2any_version_min} -lt 1; then
+ r_cv_prog_texi2any_v5=no
+ else
+ r_cv_prog_texi2any_v5=yes
+@@ -22512,7 +22512,7 @@ case "${host_os}" in
+ ## Not so bad in later versions of Darwin,
+ ## where DYLD_FALLBACK_LIBRARY_PATH is used (see below).
+ ;;
+- *)
++ donotuse*)
+ for arg in ${LDFLAGS}; do
+ case "${arg}" in
+ -L*)
+@@ -25109,6 +25109,11 @@ fi
+ done
+ ;;
+ -[lLR]*)
++ case $ac_arg in
++ -R*)
++ ac_arg="${wl}$ac_arg"
++ ;;
++ esac
+ ac_exists=false
+ for ac_i in $ac_cv_f77_libs; do
+ if test x"$ac_arg" = x"$ac_i"; then
+@@ -26074,6 +26079,9 @@ cat > conftest.c <<EOF
+
+ extern void F77_SYMBOL(cftest)(int *a, int *b, double *x, double *y);
+
++int MAIN_ () { return 0; }
++int MAIN__ () { return 0; }
++
+ int main () {
+ int a[3] = {17, 237, 2000000000}, b[2], res = 0;
+ double x[3] = {3.14159265, 123.456789, 2.3e34}, z[3];
+@@ -26169,6 +26177,9 @@ typedef struct {
+
+ extern void F77_SYMBOL(cftest)(Rcomplex *x);
+
++int MAIN_ () { return 0; }
++int MAIN__ () { return 0; }
++
+ int main () {
+ Rcomplex z[3];
+
+@@ -27774,7 +27785,7 @@ $as_echo "$as_me: WARNING: Use of flat n
+ fpicflags="${darwin_pic}"
+ shlib_cxxldflags="${shlib_ldflags}"
+ ;;
+- freebsd*)
++ freebsd*|dragonfly*)
+ ## maybe this needs to depend on the compiler:
+ ## -export-dynamic used to work, but does not with clang.
+ ## Seems FreeBSD has used the GNU linker since at least 3.0 (Oct 1998)
+@@ -27863,6 +27874,12 @@ $as_echo "$as_me: WARNING: Use of flat n
+ ;;
+ netbsd*)
+ ## See the comments about FreeBSD
++ fpicflags="-fPIC"
++ case "${host_cpu}" in
++ powerpc*)
++ cpicflags="-fPIC"
++ ;;
++ esac
+ if ${CPP} - -dM < /dev/null | grep __ELF__ >/dev/null ; then
+ main_ldflags="-Wl,--export-dynamic"
+ shlib_ldflags="-shared"
+@@ -27899,22 +27916,22 @@ $as_echo "$as_me: WARNING: Use of flat n
+ solaris*)
+ ## SPARC has only an 8k global object table, 1024 entries on 64-bit,
+ ## so need PIC not pic. They are the same on other Solaris platforms.
+- shlib_ldflags="-G"
+- shlib_cxxldflags="-G"
+ if test "${GCC}" = yes; then
++ shlib_ldflags="-shared"
++ shlib_cxxldflags="-shared"
+ cpicflags="-fPIC"
+ ld=`${CC} -print-prog-name=ld`
+ ldoutput=`${ld} -v 2>&1 | grep GNU`
+ if test -n "${ldoutput}"; then
+ main_ldflags="-Wl,-export-dynamic"
+- shlib_ldflags="-shared"
+- shlib_cxxldflags="-shared"
+ else
+ ## it seems gcc c 4.6.2 needs this with Solaris linker
+ shlib_ldflags="-shared"
+ shlib_cxxldflags="-shared"
+ fi
+ else
++ shlib_ldflags="-G"
++ shlib_cxxldflags="-G"
+ cpicflags="-KPIC"
+ if test "`basename ${CXX}`" = "CC" ; then
+ ## Forte version 7 needs -lCstd: Forte 6 does not.
+@@ -28073,10 +28090,10 @@ case "${host_os}" in
+ DYLIB_EXT=".dylib"
+ dylib_ldflags="${darwin_dylib_ldflags}"
+ MAJR_VERSION=`echo "${PACKAGE_VERSION}" | sed -e "s/[\.][1-9]$/.0/"`
+- LIBR_LDFLAGS="-install_name libR.dylib -compatibility_version ${MAJR_VERSION} -current_version ${PACKAGE_VERSION} -headerpad_max_install_names"
+- RLAPACK_LDFLAGS="-install_name libRlapack.dylib -compatibility_version ${MAJR_VERSION} -current_version ${PACKAGE_VERSION} -headerpad_max_install_names"
+- ## don't use version in libRblas so we can replace it with any BLAS implementation
+- RBLAS_LDFLAGS="-install_name libRblas.dylib -headerpad_max_install_names"
++ LIBR_LDFLAGS="-install_name ${PREFIX}/lib/R/lib/libR.dylib -compatibility_version ${MAJR_VERSION} -current_version ${PACKAGE_VERSION} -headerpad_max_install_names"
++ RLAPACK_LDFLAGS="-install_name ${PREFIX}/lib/R/lib/libRlapack.dylib -compatibility_version ${MAJR_VERSION} -current_version ${PACKAGE_VERSION} -headerpad_max_install_names"
++## don't use version in libRblas so we can replace it with any BLAS implementation
++ RBLAS_LDFLAGS="-install_name ${PREFIX}/lib/R/lib/libRblas.dylib -headerpad_max_install_names"
+ ;;
+ hpux*)
+ ## Needs to avoid embedding a relative path ../../../bin.
+@@ -33730,6 +33747,14 @@ _ACEOF
+ ## Cygwin had rintl but not nearbyintl
+ for ac_func in expm1 hypot log1p log1pl log2 log10 nearbyint nearbyintl powl rint rintl
+ do
++case $ac_func in
++expm1|log1p|log2|log10|nearbyint|nearbyintl|rint|rintl)
++ args="x"
++ ;;
++hypot|powl)
++ args="x,x"
++ ;;
++esac
+ as_ac_Symbol=`$as_echo "ac_cv_have_decl_$ac_func" | $as_tr_sh`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $ac_func exists and is declared" >&5
+ $as_echo_n "checking whether $ac_func exists and is declared... " >&6; }
+@@ -33740,23 +33765,12 @@ else
+ /* end confdefs.h. */
+ #include <math.h>
+
+-#ifdef F77_DUMMY_MAIN
+-
+-# ifdef __cplusplus
+- extern "C"
+-# endif
+- int F77_DUMMY_MAIN() { return 1; }
++volatile long double x;
+
+-#endif
+ int
+ main ()
+ {
+-#ifndef $ac_func
+- char *p = (char *) $ac_func;
+-#endif
+-
+- ;
+- return 0;
++ return $ac_func($args);;;
+ }
+ _ACEOF
+ if ac_fn_c_try_link "$LINENO"; then :
+@@ -36849,6 +36863,14 @@ cat > conftest.c <<EOF
+ # define F77_SYMBOL(x) x
+ #endif
+ extern void F77_SYMBOL(test1)(int *iflag);
++ifdef F77_DUMMY_MAIN
++
++# ifdef __cplusplus
++ extern "C"
++# endif
++ int F77_DUMMY_MAIN() { return 1; }
++
++#endif
+
+ int main () {
+ int iflag;
+@@ -36914,6 +36936,15 @@ else
+ #else
+ # define F77_SYMBOL(x) x
+ #endif
++ifdef F77_DUMMY_MAIN
++
++# ifdef __cplusplus
++ extern "C"
++# endif
++ int F77_DUMMY_MAIN() { return 1; }
++
++#endif
++
+ void F77_SYMBOL(xerbla)(char *srname, int *info)
+ {}
+ void blas_set () {
+@@ -46274,7 +46305,7 @@ case "${host_os}" in
+ r_ld_library_defaults="/usr/lib64:/lib64:/usr/lib:/lib"
+ ;;
+ solaris*)
+- r_ld_library_defaults="/usr/lib:/lib"
++ r_ld_library_defaults="/usr/lib:/lib:/usr/lib/amd64:/lib/amd64:/usr/lib/64:/lib/64"
+ ;;
+ *)
+ r_ld_library_defaults=
Home |
Main Index |
Thread Index |
Old Index