Hi ports --

Attached are two diffs. The first turns on flang support in the fortran module. This has been brought up before but stalled. It is now necessary for R to build on arm64. The second uses flang as the Fortran compiler on arm64 when building R. This allows R to successfully build and package and install.

OK?

~Brian

Index: fortran.port.mk
===================================================================
RCS file: /cvs/ports/infrastructure/mk/fortran.port.mk,v
retrieving revision 1.15
diff -u -p -r1.15 fortran.port.mk
--- fortran.port.mk	14 Jan 2019 21:27:37 -0000	1.15
+++ fortran.port.mk	8 May 2019 04:32:27 -0000
@@ -17,6 +17,10 @@ MODGCC4_LANGS += fortran
 MODFORTRAN_BUILD_DEPENDS += ${MODGCC4_FORTRANDEP}
 MODFORTRAN_LIB_DEPENDS += ${MODGCC4_FORTRANLIBDEP}
 MODFORTRAN_WANTLIB += ${MODGCC4_FORTRANWANTLIB}
+.elif ${MODFORTRAN_COMPILER:L} == "flang"
+MODFORTRAN_BUILD_DEPENDS += lang/flang/flang
+MODFORTRAN_LIB_DEPENDS += lang/flang/flang
+MODFORTRAN_WANTLIB += compiler_rt flang flangmain flangrti pgmath
 .else
-ERRORS += "Fatal: MODFORTRAN_COMPILER must be one of: g77 gfortran"
+ERRORS += "Fatal: MODFORTRAN_COMPILER must be one of: g77 gfortran flang"
 .endif
Index: Makefile
===================================================================
RCS file: /cvs/ports/math/R/Makefile,v
retrieving revision 1.109
diff -u -p -r1.109 Makefile
--- Makefile	29 Apr 2019 08:52:47 -0000	1.109
+++ Makefile	8 May 2019 04:38:25 -0000
@@ -37,7 +37,11 @@ MASTER_SITES=	https://cran.r-project.org
 MODULES=	fortran \
 		x11/tk
 
+.if ${MACHINE_ARCH:Maarch64}
+MODFORTRAN_COMPILER = flang
+.else
 MODFORTRAN_COMPILER = gfortran
+.endif
 
 BUILD_DEPENDS=	${MODFORTRAN_BUILD_DEPENDS} \
 		archivers/gtar \

Reply via email to