Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 26 Oct 2017 17:05:20 +0000 (UTC)
From:      Joseph Mingrone <jrm@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r452928 - head/math/R
Message-ID:  <201710261705.v9QH5KKK059463@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jrm
Date: Thu Oct 26 17:05:20 2017
New Revision: 452928
URL: https://svnweb.freebsd.org/changeset/ports/452928

Log:
  math/R: Use the new flang argument to USES=fortran and patch libR.pc to link the
  appropriate BLAS library.
  
  PR:		220418
  Submitted by:	yuri@rawbw.com

Modified:
  head/math/R/Makefile

Modified: head/math/R/Makefile
==============================================================================
--- head/math/R/Makefile	Thu Oct 26 16:52:38 2017	(r452927)
+++ head/math/R/Makefile	Thu Oct 26 17:05:20 2017	(r452928)
@@ -3,6 +3,7 @@
 
 PORTNAME=		R
 DISTVERSION=		3.4.2
+PORTREVISION=		1
 CATEGORIES=		math lang
 MASTER_SITES=		CRAN/src/base/R-${PORTVERSION:C|\..*||}
 
@@ -75,17 +76,9 @@ CAIROPANGO_IMPLIES=	X11
 CAIROPANGO_CONFIGURE_WITH=cairo
 CAIROPANGO_USES=	gettext jpeg pkgconfig
 CAIROPANGO_USE=		GNOME=pango,cairo
-FLANG_USE=		binutils
-#FLANG_USES=		fortran:flang
+FLANG_USES=		fortran:flang
 FLANG_PREVENTS=		ATLAS OPENBLAS NETLIB
-FLANG_BUILD_DEPENDS=	flang:devel/flang
-FLANG_RUN_DEPENDS=	flang:devel/flang
-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_USES=		fortran:gcc
 GFORTRAN_RUN_DEPENDS=	wget:ftp/wget
 GHOSTSCRIPT_IMPLIES=	X11
 GHOSTSCRIPT_USES=	ghostscript
@@ -144,6 +137,14 @@ post-patch:
 		${WRKSRC}/src/main/Makefile.in \
 		${WRKSRC}/src/extra/blas/Makefile.in \
 		${WRKSRC}/src/modules/lapack/Makefile.in
+
+post-install-RBLAS-on:
+	@${REINPLACE_CMD} -e "s| -lR| -lR -lRblas|" \
+		${STAGEDIR}${PREFIX}/libdata/pkgconfig/libR.pc
+
+post-install-RBLAS-off:
+	@${REINPLACE_CMD} -e "s| -lR| -lR ${BLASLIB}|" \
+		${STAGEDIR}${PREFIX}/libdata/pkgconfig/libR.pc
 
 .include <bsd.port.pre.mk>
 .include "compiler.mk"



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201710261705.v9QH5KKK059463>