From owner-svn-ports-all@FreeBSD.ORG Mon Feb 24 22:15:33 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7D7EB734; Mon, 24 Feb 2014 22:15:33 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 502881D0D; Mon, 24 Feb 2014 22:15:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1OMFXif044842; Mon, 24 Feb 2014 22:15:33 GMT (envelope-from gerald@svn.freebsd.org) Received: (from gerald@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1OMFWHO044840; Mon, 24 Feb 2014 22:15:32 GMT (envelope-from gerald@svn.freebsd.org) Message-Id: <201402242215.s1OMFWHO044840@svn.freebsd.org> From: Gerald Pfeifer Date: Mon, 24 Feb 2014 22:15:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r345903 - head/Mk X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Feb 2014 22:15:33 -0000 Author: gerald Date: Mon Feb 24 22:15:32 2014 New Revision: 345903 URL: http://svnweb.freebsd.org/changeset/ports/345903 QAT: https://qat.redports.org/buildarchive/r345903/ Log: Replace all uses of GCC_DEFAULT_VERSION by GCC_DEFAULT, remove the definition of the former from Mk/bsd.gcc.mk and add the latter -- still set to 4.6 -- to Mk/bsd.default-versions.mk. Include Mk/bsd.default-versions.mk from Mk/bsd.gcc.mk to tie the two together. Modified: head/Mk/bsd.default-versions.mk head/Mk/bsd.gcc.mk Modified: head/Mk/bsd.default-versions.mk ============================================================================== --- head/Mk/bsd.default-versions.mk Mon Feb 24 22:15:01 2014 (r345902) +++ head/Mk/bsd.default-versions.mk Mon Feb 24 22:15:32 2014 (r345903) @@ -18,6 +18,7 @@ ${_l:U}_DEFAULT= ${lang:C/.*=//g} .endfor APACHE_DEFAULT?= 2.2 +GCC_DEFAULT?= 4.6 FPC_DEFAULT?= 2.6.2 LUA_DEFAULT?= 5.2 MYSQL_DEFAULT?= 5.5 Modified: head/Mk/bsd.gcc.mk ============================================================================== --- head/Mk/bsd.gcc.mk Mon Feb 24 22:15:01 2014 (r345902) +++ head/Mk/bsd.gcc.mk Mon Feb 24 22:15:32 2014 (r345903) @@ -32,6 +32,8 @@ GCC_Include_MAINTAINER= gerald@FreeBSD.org +.include "${PORTSDIR}/Mk/bsd.default-versions.mk" + # All GCC versions supported by the ports framework. Keep them in # ascending order and in sync with the table below. GCCVERSIONS= 040200 040600 040700 040800 040900 @@ -45,14 +47,13 @@ GCCVERSION_040700= 0 0 4.7 GCCVERSION_040800= 0 0 4.8 GCCVERSION_040900= 0 0 4.9 -GCC_DEFAULT_VERSION= 4.6 -GCC_DEFAULT_V= ${GCC_DEFAULT_VERSION:S/.//} +GCC_DEFAULT_V= ${GCC_DEFAULT:S/.//} # No configurable parts below this. #################################### # .if defined(USE_GCC) && ${USE_GCC} == yes -USE_GCC= ${GCC_DEFAULT_VERSION}+ +USE_GCC= ${GCC_DEFAULT}+ .endif # Extract the fields from GCCVERSION_... @@ -131,8 +132,8 @@ _GCC_FOUND:= ${_GCCVERSION_${v}_V} . if defined(_GCC_FOUND) _USE_GCC:= ${_GCC_FOUND} -. elif ${_USE_GCC} < ${GCC_DEFAULT_VERSION} -_USE_GCC:= ${GCC_DEFAULT_VERSION} +. elif ${_USE_GCC} < ${GCC_DEFAULT} +_USE_GCC:= ${GCC_DEFAULT} . endif .endif # defined(_GCC_ORLATER) @@ -148,7 +149,7 @@ _USE_GCC:= ${GCC_DEFAULT_VERSION} . 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_VERSION} +. if ${_USE_GCC} == ${GCC_DEFAULT} _GCC_PORT:= gcc . else _GCC_PORT:= gcc${V}