Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 26 Jan 2015 00:03:47 +0000 (UTC)
From:      Gerald Pfeifer <gerald@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r377909 - in head/Mk: . Uses
Message-ID:  <201501260003.t0Q03lDK070740@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: gerald
Date: Mon Jan 26 00:03:46 2015
New Revision: 377909
URL: https://svnweb.freebsd.org/changeset/ports/377909
QAT: https://qat.redports.org/buildarchive/r377909/

Log:
  Move LANG_GCC_IS from bsd.gcc.mk to bsd.default-versions.mk and use
  this and GCC_DEFAULT instead of hard-coding the version of GCC used
  by lang/gcc in Uses/fortran.mk.
  
  Approved by:	portmgr (antoine)

Modified:
  head/Mk/Uses/fortran.mk
  head/Mk/bsd.default-versions.mk
  head/Mk/bsd.gcc.mk

Modified: head/Mk/Uses/fortran.mk
==============================================================================
--- head/Mk/Uses/fortran.mk	Sun Jan 25 23:42:16 2015	(r377908)
+++ head/Mk/Uses/fortran.mk	Mon Jan 26 00:03:46 2015	(r377909)
@@ -18,7 +18,7 @@ fortran_ARGS=	gcc
 .if ${fortran_ARGS} == gcc
 .include "${PORTSDIR}/Mk/bsd.default-versions.mk"
 _GCC_VER=	${GCC_DEFAULT:S/.//}
-.if ${_GCC_VER} == 48
+.if ${GCC_DEFAULT} == ${LANG_GCC_IS}
 BUILD_DEPENDS+=	gfortran${_GCC_VER}:${PORTSDIR}/lang/gcc
 RUN_DEPENDS+=	gfortran${_GCC_VER}:${PORTSDIR}/lang/gcc
 .else

Modified: head/Mk/bsd.default-versions.mk
==============================================================================
--- head/Mk/bsd.default-versions.mk	Sun Jan 25 23:42:16 2015	(r377908)
+++ head/Mk/bsd.default-versions.mk	Mon Jan 26 00:03:46 2015	(r377909)
@@ -33,4 +33,7 @@ RUBY_DEFAULT?=		2.0
 TCLTK_DEFAULT?=		8.6
 FIREBIRD_DEFAULT?=	2.5
 
+# Version of lang/gcc.  Do not override!
+LANG_GCC_IS=		4.8
+
 .endif

Modified: head/Mk/bsd.gcc.mk
==============================================================================
--- head/Mk/bsd.gcc.mk	Sun Jan 25 23:42:16 2015	(r377908)
+++ head/Mk/bsd.gcc.mk	Mon Jan 26 00:03:46 2015	(r377909)
@@ -47,9 +47,6 @@ GCCVERSION_040800=	     0       0 4.8
 GCCVERSION_040900=	     0       0 4.9
 GCCVERSION_050000=	     0       0 5
 
-# Version of lang/gcc
-LANG_GCC_IS=	4.8
-
 # No configurable parts below this. ####################################
 #
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201501260003.t0Q03lDK070740>