Attachment 181428 Details for Bug 218330 – Proposed patch

[patch] Proposed patch

x (text/plain), 1.34 KB, created by Gerald Pfeifer on 2017-04-03 13:53:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Gerald Pfeifer

Created: 2017-04-03 13:53:25 UTC

Size: 1.34 KB

patch

obsolete

>Index: Mk/Uses/fortran.mk
>===================================================================
>--- Mk/Uses/fortran.mk	(revision 437659)
>+++ Mk/Uses/fortran.mk	(working copy)
>@@ -17,13 +17,8 @@
> 
> .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}
>Index: Mk/bsd.default-versions.mk
>===================================================================
>--- Mk/bsd.default-versions.mk	(revision 437659)
>+++ Mk/bsd.default-versions.mk	(working copy)
>@@ -140,7 +140,4 @@
> # Possible values: 4, 5
> VARNISH_DEFAULT?=	4
> 
>-# Version of lang/gcc.  Do not override!
>-LANG_GCC_IS=		5
>-
> .endif
>Index: Mk/bsd.gcc.mk
>===================================================================
>--- Mk/bsd.gcc.mk	(revision 437659)
>+++ Mk/bsd.gcc.mk	(working copy)
>@@ -144,11 +144,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}

Actions: View | Diff

Attachments on bug 218330: 181428