From 9fa2ec2d74584bc9a9b2e5dae029a58030864907 Mon Sep 17 00:00:00 2001 From: Joseph Mingrone Date: Fri, 29 Sep 2017 17:54:02 +0000 Subject: [PATCH] math/R: Update to version 3.4.2 Also - Build Fortran code with flang by default on amd64. - Remove LTO option. Upstream does not turn it on by default, it has caused problems with each GCC upgrade, and any benefit is unclear. - Do not specify USES=compiler:openmp since that just forces GCC. --- math/R/Makefile | 30 ++++++++++++------------------ math/R/distinfo | 6 +++--- math/R/pkg-message | 8 ++++---- 3 files changed, 19 insertions(+), 25 deletions(-) diff --git a/math/R/Makefile b/math/R/Makefile index 545b68441660..3103c6c93f4d 100644 --- a/math/R/Makefile +++ b/math/R/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= R -DISTVERSION= 3.4.1 -PORTREVISION= 8 +DISTVERSION= 3.4.2 CATEGORIES= math lang MASTER_SITES= CRAN/src/base/R-${PORTVERSION:C|\..*||} @@ -29,9 +28,8 @@ USES= gmake iconv libtool localbase \ USE_PERL5= build USE_LDCONFIG= ${PREFIX}/lib/R/lib -OPTIONS_DEFINE= ICU INFO LDOUBLE LETTER LIBR MEMPROF NLS RPROF X11 -OPTIONS_GROUP= NEEDGCC NEEDX11 -OPTIONS_GROUP_NEEDGCC= LTO OPENMP +OPTIONS_DEFINE= ICU INFO LDOUBLE LETTER LIBR MEMPROF NLS OPENMP RPROF X11 +OPTIONS_GROUP= NEEDX11 OPTIONS_GROUP_NEEDX11= GHOSTSCRIPT JPEG CAIROPANGO PNG TCLTK TEXDOCS TIFF OPTIONS_SINGLE= BLAS FORTRAN OPTIONS_SINGLE_BLAS= ATLAS OPENBLAS NETLIB RBLAS @@ -43,16 +41,15 @@ OPTIONS_SINGLE_FORTRAN_amd64= GFORTRAN FLANG OPTIONS_SUB= YES ATLAS_DESC= ATLAS BLAS implementation -FLANG_DESC= Experimental Fortran support via flang +FLANG_DESC= Build Fortran source with flang GHOSTSCRIPT_DESC= Graphics device for bitmap files via Ghostscript CAIROPANGO_DESC= Cairo graphics device and Pango multi-language text -GFORTRAN_DESC= Fortran support via gfortran +GFORTRAN_DESC= Build Fortran source with gfortran INFO_DESC= GNU info manuals JPEG_DESC= JPEG graphics device LDOUBLE_DESC= Long double data type LETTER_DESC= US letter paper LIBR_DESC= Shared R library -LTO_DESC= Use Link Time Optimization MEMPROF_DESC= Memory profiling via Rprofmem() and tracemem() NEEDGCC_DESC= Require GCC NEEDX11_DESC= Require X11 @@ -64,8 +61,11 @@ RPROF_DESC= R profiling via Rprof() TEXDOCS_DESC= Build/Install TeX-dependent documentation files X11_DESC= X11 graphics device -OPTIONS_DEFAULT= CAIROPANGO GFORTRAN GHOSTSCRIPT ICU INFO JPEG LDOUBLE \ - LIBR PNG RBLAS RPROF TCLTK TIFF X11 +OPTIONS_DEFAULT= CAIROPANGO GHOSTSCRIPT ICU INFO JPEG LDOUBLE LIBR PNG \ + RBLAS RPROF TCLTK TIFF X11 +OPTIONS_DEFAULT_aarch64=GFORTRAN +OPTIONS_DEFAULT_amd64= FLANG +OPTIONS_DEFAULT_i386= GFORTRAN ATLAS_USES= blaslapack:atlas ATLAS_CONFIGURE_ON= --disable-BLAS-shlib @@ -76,6 +76,7 @@ CAIROPANGO_CONFIGURE_WITH=cairo CAIROPANGO_USES= gettext jpeg pkgconfig CAIROPANGO_USE= GNOME=pango,cairo FLANG_USE= binutils +#FLANG_USES= fortran:flang FLANG_PREVENTS= ATLAS OPENBLAS NETLIB FLANG_BUILD_DEPENDS= flang:devel/flang FLANG_RUN_DEPENDS= flang:devel/flang @@ -83,6 +84,7 @@ FLANG_VARS= F77=flang FC=flang FLANG_LDFLAGS= -L${LOCALBASE}/flang/lib -lflang -lexecinfo FLANG_CONFIGURE_ENV= F77="${F77}" FC="${FC}" FFLAGS="${FFLAGS}" FLANG_MAKE_ENV= F77="${F77}" FC="${FC}" FFLAGS="${FFLAGS}" +#GFORTRAN_USE= gcc=yes GFORTRAN_USES= fortran GFORTRAN_RUN_DEPENDS= wget:ftp/wget GHOSTSCRIPT_IMPLIES= X11 @@ -99,13 +101,6 @@ LDOUBLE_CONFIGURE_ENABLE=long-double LETTER_CONFIGURE_ENV= R_PAPERSIZE=letter LIBR_CONFIGURE_ENABLE= R-shlib LIBR_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src_main_Makefile.in -LTO_CONFIGURE_ENABLE= lto -LTO_CONFIGURE_ENV= AR="${LOCALBASE}/bin/gcc-ar${GCC_DEFAULT:S/.//g}" \ - RANLIB="${LOCALBASE}/bin/gcc-ranlib${GCC_DEFAULT:S/.//g}" -LTO_PREVENTS= FLANG -LTO_USE= GCC=yes -LTO_VARS= BINUTILS="ADDR2LINE AS CPPFILT GPROF LD NM OBJCOPY \ - OBJDUMP READELF SIZE STRINGS" MEMPROF_CONFIGURE_ENABLE=memory-profiling NETLIB_USES= blaslapack:netlib NETLIB_CONFIGURE_ON= --disable-BLAS-shlib @@ -115,7 +110,6 @@ OPENBLAS_USES= blaslapack:openblas OPENBLAS_CONFIGURE_ON= --disable-BLAS-shlib OPENMP_CONFIGURE_ENABLE=openmp OPENMP_LIB_DEPENDS= libomp.so:devel/openmp -OPENMP_USES= compiler:openmp PNG_IMPLIES= X11 PNG_LIB_DEPENDS= libpng.so:graphics/png PNG_CONFIGURE_WITH= libpng diff --git a/math/R/distinfo b/math/R/distinfo index bca1071b9258..b1424a0c3b05 100644 --- a/math/R/distinfo +++ b/math/R/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1498946951 -SHA256 (R-3.4.1.tar.gz) = 02b1135d15ea969a3582caeb95594a05e830a6debcdb5b85ed2d5836a6a3fc78 -SIZE (R-3.4.1.tar.gz) = 30200109 +TIMESTAMP = 1506599196 +SHA256 (R-3.4.2.tar.gz) = 971e30c2436cf645f58552905105d75788bd9733bddbcb7c4fbff4c1a6d80c64 +SIZE (R-3.4.2.tar.gz) = 30255544 diff --git a/math/R/pkg-message b/math/R/pkg-message index 13a32a033190..9ac5539dd34b 100644 --- a/math/R/pkg-message +++ b/math/R/pkg-message @@ -1,14 +1,14 @@ ======================================================================== On 11.1 and later, there is a problem downloading R packages when -gfortran is chosen as the fortran compiler. +R is built with gfortran. Use either of these workarounds until a permanent solution is found. -1. If you are on an amd64 system, you can use flang as the fortran - compiler. +1. If you are on an amd64 system, use flang to build R. R is now built + by default using flang on amd64. -2. If you choose gfortran as the fortran compiler, you can add +2. If you use gfortran to build R, add options(download.file.method="wget")