Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 22 Dec 2012 21:35:36 +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: r309406 - head/Mk
Message-ID:  <201212222135.qBMLZaUw059843@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: gerald
Date: Sat Dec 22 21:35:35 2012
New Revision: 309406
URL: http://svnweb.freebsd.org/changeset/ports/309406

Log:
  Add a new form of USE_GCC, USE_GCC=yes, which generically requests
  a current version of GCC.  This reduces churn for individual ports
  and further increases consistency (in line with a canonical version
  that we introduced with GCC_DEFAULT_VERSION earlier on and the older
  USE_FORTRAN=yes).
  
  On the way, make some comments more consistent.
  
  Discussed with:	linimon

Modified:
  head/Mk/bsd.gcc.mk

Modified: head/Mk/bsd.gcc.mk
==============================================================================
--- head/Mk/bsd.gcc.mk	Sat Dec 22 20:54:59 2012	(r309405)
+++ head/Mk/bsd.gcc.mk	Sat Dec 22 21:35:35 2012	(r309406)
@@ -5,14 +5,20 @@
 #
 # Created by: Edwin Groothuis <edwin@freebsd.org>
 #
-# For port developers:
+# To request the use of a current version of GCC, specify USE_GCC=yes in
+# your port/system configuration.  This is the preferred use of USE_GCC.
+# It defines a canonical, default version of GCC; the same version of
+# GCC is also implied by USE_FORTRAN=yes.
+# 
 # If your port needs a specific (minimum) version of GCC, you can easily
-# specify that with a "USE_GCC=" statement.  Unless absolutely necessary
-# do so by specifying "USE_GCC=X.Y+" which requests at least GCC version
+# specify that with a USE_GCC= statement.  Unless absolutely necessary
+# do so by specifying USE_GCC=X.Y+ which requests at least GCC version
 # X.Y.  To request a specific version omit the trailing + sign.  Use of
 # a Fortran compiler is declared by the USE_FORTRAN knob, not USE_GCC.
 #
 # Examples:
+#   USE_GCC=	yes			# port requires a current version of GCC
+#							# (4.6 as of today, subject to change).
 #   USE_GCC=	4.2+		# port requires GCC 4.2 or later.
 #   USE_GCC=	4.7			# port requires GCC 4.7.
 #
@@ -54,6 +60,10 @@ GCC_DEFAULT_V=	${GCC_DEFAULT_VERSION:S/.
 # No configurable parts below this. ####################################
 #
 
+.if ${USE_GCC} == yes
+USE_GCC=	${GCC_DEFAULT_VERSION}+
+.endif
+
 # Extract the fields from GCCVERSION_...
 .for v in ${GCCVERSIONS}
 . for j in ${GCCVERSION_${v}}
@@ -104,7 +114,7 @@ MAKE_ENV+=		F77="${F77}" FC="${FC}" FFLA
 
 . if ${USE_GCC} == any
 
-# enable the clang-is-cc workaround.  default to the last gcc imported
+# Enable the clang-is-cc workaround.  Default to the last GCC imported
 # into base.
 _USE_GCC:=	4.2
 _GCC_ORLATER:=	true



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