[Midnightbsd-cvs] mports [23337] trunk/Mk: update gcc config

[laffer1 at midnightbsd.org]

Revision: 23337
          http://svnweb.midnightbsd.org/mports/?rev=23337
Author:   laffer1
Date:     2018-05-03 09:42:20 -0400 (Thu, 03 May 2018)
Log Message:
-----------
update gcc config

Modified Paths:
--------------
    trunk/Mk/components/default-versions.mk
    trunk/Mk/extensions/fortran.mk
    trunk/Mk/extensions/gcc.mk

Modified: trunk/Mk/components/default-versions.mk
===================================================================
--- trunk/Mk/components/default-versions.mk	2018-05-03 13:36:03 UTC (rev 23336)
+++ trunk/Mk/components/default-versions.mk	2018-05-03 13:42:20 UTC (rev 23337)
@@ -18,7 +18,7 @@
 
 APACHE_DEFAULT?=	2.4
 FPC_DEFAULT?=		2.6.4
-GCC_DEFAULT?=		4.8
+GCC_DEFAULT?=		6
 GHOSTSCRIPT_DEFAULT?=	9
 LUA_DEFAULT?=		5.2
 MYSQL_DEFAULT?=		5.6
@@ -32,7 +32,4 @@
 SAMBA_DEFAULT?=		4.4
 TCLTK_DEFAULT?=		8.6
 
-# Version of lang/gcc.  Do not override!
-LANG_GCC_IS=		4.8
-
 .endif

Modified: trunk/Mk/extensions/fortran.mk
===================================================================
--- trunk/Mk/extensions/fortran.mk	2018-05-03 13:36:03 UTC (rev 23336)
+++ trunk/Mk/extensions/fortran.mk	2018-05-03 13:42:20 UTC (rev 23337)
@@ -1,31 +1,34 @@
 # $MidnightBSD$
-# $FreeBSD: head/Mk/Uses/fortran.mk 399326 2015-10-15 07:36:38Z bapt $
+# $FreeBSD: head/Mk/Uses/fortran.mk 454428 2017-11-18 13:09:56Z tijl $
 #
 # Fortran support
 #
 # Feature:	fortran
 # Usage:	USES=fortran
-# Valid ARGS:	gcc (default), ifort
-#
+# Valid ARGS:	flang, gfortran (default)
 
 .if !defined(_INCLUDE_USES_FORTRAN_MK)
 _INCLUDE_USES_FORTRAN_MK=	yes
 
 .if empty(fortran_ARGS)
-fortran_ARGS=	gcc
+fortran_ARGS=	${FORTRAN_DEFAULT}
 .endif
 
-.if ${fortran_ARGS} == gcc
+.if ${fortran_ARGS} == flang
+.if ${ARCH} == amd64
+BUILD_DEPENDS+=	flang:devel/flang
+RUN_DEPENDS+=	flang:devel/flang
+F77=		flang
+FC=		flang
+LDFLAGS+=	-L${LOCALBASE}/flang/lib -Wl,--as-needed -lflang -lexecinfo -Wl,--no-as-needed
+.else
+IGNORE=		USES=fortran: flang argument only available for amd64
+.endif
+.elif ${fortran_ARGS} == gfortran
 .include "${PORTSDIR}/Mk/components/default-versions.mk"
 _GCC_VER=	${GCC_DEFAULT:S/.//}
-.if ${GCC_DEFAULT} == ${LANG_GCC_IS}
-BUILD_DEPENDS+=	gfortran${_GCC_VER}:${PORTSDIR}/lang/gcc
-RUN_DEPENDS+=	gfortran${_GCC_VER}:${PORTSDIR}/lang/gcc
-.else
-BUILD_DEPENDS+=	gfortran${_GCC_VER}:${PORTSDIR}/lang/gcc${_GCC_VER}
-RUN_DEPENDS+=	gfortran${_GCC_VER}:${PORTSDIR}/lang/gcc${_GCC_VER}
-.endif
-USE_BINUTILS=	yes
+BUILD_DEPENDS+=	gfortran${_GCC_VER}:lang/gcc${_GCC_VER}
+RUN_DEPENDS+=	gfortran${_GCC_VER}:lang/gcc${_GCC_VER}
 F77=		gfortran${_GCC_VER}
 FC=		gfortran${_GCC_VER}
 FFLAGS+=	-Wl,-rpath=${LOCALBASE}/lib/gcc${_GCC_VER}
@@ -32,15 +35,11 @@
 FCFLAGS+=	-Wl,-rpath=${LOCALBASE}/lib/gcc${_GCC_VER}
 LDFLAGS+=	-Wl,-rpath=${LOCALBASE}/lib/gcc${_GCC_VER} \
 		-L${LOCALBASE}/lib/gcc${_GCC_VER} -B${LOCALBASE}/bin
-.elif ${fortran_ARGS} == ifort
-BUILD_DEPENDS+=	${LOCALBASE}/intel_fc_80/bin/ifort:${PORTSDIR}/lang/ifc
-RUN_DEPENDS+=	${LOCALBASE}/intel_fc_80/bin/ifort:${PORTSDIR}/lang/ifc
-F77=		${LOCALBASE}/intel_fc_80/bin/ifort
-FC=		${LOCALBASE}/intel_fc_80/bin/ifort
 .else
 IGNORE=		USES=fortran: invalid arguments: ${fortran_ARGS}
 .endif
 
+USE_BINUTILS=	yes
 CONFIGURE_ENV+=	F77="${F77}" FC="${FC}" FFLAGS="${FFLAGS}" FCFLAGS="${FCFLAGS}"
 MAKE_ENV+=	F77="${F77}" FC="${FC}" FFLAGS="${FFLAGS}" FCFLAGS="${FCFLAGS}"
 

Modified: trunk/Mk/extensions/gcc.mk
===================================================================
--- trunk/Mk/extensions/gcc.mk	2018-05-03 13:36:03 UTC (rev 23336)
+++ trunk/Mk/extensions/gcc.mk	2018-05-03 13:42:20 UTC (rev 23337)
@@ -21,7 +21,7 @@
 #   USE_GCC=	yes			# port requires a current version of GCC
 #							# as defined in bsd.default-versions.mk.
 #   USE_GCC=	any			# port requires GCC 4.2 or later.
-#   USE_GCC=	4.9+		# port requires GCC 4.9 or later.
+#   USE_GCC=	6+		# port requires GCC 6 or later.
 #   USE_GCC=	4.9			# port requires GCC 4.9.
 #
 # If you are wondering what your port exactly does, use "make test-gcc"
@@ -49,6 +49,7 @@
 GCCVERSION_040900=	      0 4.9
 GCCVERSION_050000=	      0 5
 GCCVERSION_060000=	      0 6
+GCCVERSION_070000=	      0 7
 
 # No configurable parts below this. ####################################
 #
@@ -148,11 +149,7 @@
 .  if ${OSVERSION} > ${_GCCVERSION_${v}_R} || !exists(/usr/bin/gcc)
 V:=			${_GCCVERSION_${v}_V:S/.//}
 _GCC_PORT_DEPENDS:=	gcc${V}
-.   if ${_USE_GCC} == ${LANG_GCC_IS}
-_GCC_PORT:=		gcc
-.   else
 _GCC_PORT:=		gcc${V}
-.   endif
 CC:=			gcc${V}
 CXX:=			g++${V}
 CPP:=			cpp${V}
@@ -174,8 +171,8 @@
 .undef V
 
 .if defined(_GCC_PORT_DEPENDS)
-BUILD_DEPENDS+=	${_GCC_PORT_DEPENDS}:${PORTSDIR}/lang/${_GCC_PORT}
-RUN_DEPENDS+=	${_GCC_PORT_DEPENDS}:${PORTSDIR}/lang/${_GCC_PORT}
+BUILD_DEPENDS+=	${_GCC_PORT_DEPENDS}:lang/${_GCC_PORT}
+RUN_DEPENDS+=	${_GCC_PORT_DEPENDS}:lang/${_GCC_PORT}
 # Later GCC ports already depend on binutils; make sure whatever we
 # build leverages this as well.
 USE_BINUTILS=	yes