Attachment #181428 for bug #218330

View | Details | Raw Unified | Return to bug 218330
Collapse All | Expand All





.if ${fortran_ARGS} == gcc
_GCC_VER=	${GCC_DEFAULT:S/.//}
.if ${GCC_DEFAULT} == ${LANG_GCC_IS}
BUILD_DEPENDS+=	gfortran${_GCC_VER}:lang/gcc
RUN_DEPENDS+=	gfortran${_GCC_VER}:lang/gcc
.else
BUILD_DEPENDS+=	gfortran${_GCC_VER}:lang/gcc${_GCC_VER}
RUN_DEPENDS+=	gfortran${_GCC_VER}:lang/gcc${_GCC_VER}
.endif
USE_BINUTILS=	yes
F77=		gfortran${_GCC_VER}
FC=		gfortran${_GCC_VER}

Lines 140-146 Link Here

(-)Mk/bsd.default-versions.mk (-3 lines)
140	# Possible values: 4, 5	140	# Possible values: 4, 5
141	VARNISH_DEFAULT?= 4	141	VARNISH_DEFAULT?= 4
142		142
143	# Version of lang/gcc. Do not override!
144	LANG_GCC_IS= 5
145
146	.endif	143	.endif

Lines 144-154 Link Here

(-)Mk/bsd.gcc.mk (-4 lines)
144	. if ${OSVERSION} > ${_GCCVERSION_${v}_R} \|\| !exists(/usr/bin/gcc)	144	. if ${OSVERSION} > ${_GCCVERSION_${v}_R} \|\| !exists(/usr/bin/gcc)
145	V:= ${_GCCVERSION_${v}_V:S/.//}	145	V:= ${_GCCVERSION_${v}_V:S/.//}
146	_GCC_PORT_DEPENDS:= gcc${V}	146	_GCC_PORT_DEPENDS:= gcc${V}
147	. if ${_USE_GCC} == ${LANG_GCC_IS}
148	_GCC_PORT:= gcc
149	. else
150	_GCC_PORT:= gcc${V}	147	_GCC_PORT:= gcc${V}
151	. endif
152	CC:= gcc${V}	148	CC:= gcc${V}
153	CXX:= g++${V}	149	CXX:= g++${V}
154	CPP:= cpp${V}	150	CPP:= cpp${V}

Return to bug 218330

Lines 17-29 Link Here

(-)Mk/Uses/fortran.mk (-5 lines)
17		17
18	.if ${fortran_ARGS} == gcc	18	.if ${fortran_ARGS} == gcc
19	_GCC_VER= ${GCC_DEFAULT:S/.//}	19	_GCC_VER= ${GCC_DEFAULT:S/.//}
20	.if ${GCC_DEFAULT} == ${LANG_GCC_IS}
21	BUILD_DEPENDS+= gfortran${_GCC_VER}:lang/gcc
22	RUN_DEPENDS+= gfortran${_GCC_VER}:lang/gcc
23	.else
24	BUILD_DEPENDS+= gfortran${_GCC_VER}:lang/gcc${_GCC_VER}	20	BUILD_DEPENDS+= gfortran${_GCC_VER}:lang/gcc${_GCC_VER}
25	RUN_DEPENDS+= gfortran${_GCC_VER}:lang/gcc${_GCC_VER}	21	RUN_DEPENDS+= gfortran${_GCC_VER}:lang/gcc${_GCC_VER}
26	.endif
27	USE_BINUTILS= yes	22	USE_BINUTILS= yes
28	F77= gfortran${_GCC_VER}	23	F77= gfortran${_GCC_VER}
29	FC= gfortran${_GCC_VER}	24	FC= gfortran${_GCC_VER}