svn commit: r369328 - in head/Mk: . Uses

[Tijl Coosemans]

Author: tijl
Date: Fri Sep 26 16:00:41 2014
New Revision: 369328
URL: http://svnweb.freebsd.org/changeset/ports/369328
QAT: https://qat.redports.org/buildarchive/r369328/

Log:
  Depend on lang/gccXY if users wish to use a different version of gcc by
  default than lang/gcc (currently 4.8).
  
  (I don't fully agree with this implementation but this makes something
  like DEFAULT_VERSIONS+=gcc=4.9 in make.conf work correctly.)
  
  Reported by:	Luca Pizzamiglio <luca.pizzamiglio at gmail.com>
  Approved by:	gerald

Modified:
  head/Mk/Uses/fortran.mk
  head/Mk/bsd.gcc.mk

Modified: head/Mk/Uses/fortran.mk
==============================================================================
--- head/Mk/Uses/fortran.mk	Fri Sep 26 15:00:18 2014	(r369327)
+++ head/Mk/Uses/fortran.mk	Fri Sep 26 16:00:41 2014	(r369328)
@@ -18,8 +18,13 @@ fortran_ARGS=	gcc
 .if ${fortran_ARGS} == gcc
 .include "${PORTSDIR}/Mk/bsd.default-versions.mk"
 _GCC_VER=	${GCC_DEFAULT:S/.//}
+.if ${_GCC_VER} == 48
 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
 F77=		gfortran${_GCC_VER}
 FC=		gfortran${_GCC_VER}

Modified: head/Mk/bsd.gcc.mk
==============================================================================
--- head/Mk/bsd.gcc.mk	Fri Sep 26 15:00:18 2014	(r369327)
+++ head/Mk/bsd.gcc.mk	Fri Sep 26 16:00:41 2014	(r369328)
@@ -46,7 +46,8 @@ GCCVERSION_040700=	     0       0 4.7
 GCCVERSION_040800=	     0       0 4.8
 GCCVERSION_040900=	     0       0 4.9
 
-GCC_DEFAULT_V=	${GCC_DEFAULT:S/.//}
+# Version of lang/gcc
+GCC_DEFAULT_V=	4.8
 
 # No configurable parts below this. ####################################
 #
@@ -148,7 +149,7 @@ _USE_GCC:=	${GCC_DEFAULT}
 .  if ${OSVERSION} < ${_GCCVERSION_${v}_L} || ${OSVERSION} > ${_GCCVERSION_${v}_R} || !exists(/usr/bin/gcc)
 V:=			${_GCCVERSION_${v}_V:S/.//}
 _GCC_PORT_DEPENDS:=	gcc${V}
-.   if ${_USE_GCC} == ${GCC_DEFAULT}
+.   if ${_USE_GCC} == ${GCC_DEFAULT_V}
 _GCC_PORT:=		gcc
 .   else
 _GCC_PORT:=		gcc${V}