Date: Wed, 22 Apr 2015 21:29:21 +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: r384521 - head/Mk Message-ID: <201504222129.t3MLTLut046445@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gerald Date: Wed Apr 22 21:29:21 2015 New Revision: 384521 URL: https://svnweb.freebsd.org/changeset/ports/384521 Log: Since there is not going to be any new version of GCC in the FreeBSD base system ever again, simplify the GCCVERSION table and logic to not worry about minimum system versions carrying a certain version of GCC. This also removes the _GCCVERSION_${v}_R variables and simplifies some logic and debug output. Modified: head/Mk/bsd.gcc.mk Modified: head/Mk/bsd.gcc.mk ============================================================================== --- head/Mk/bsd.gcc.mk Wed Apr 22 20:16:04 2015 (r384520) +++ head/Mk/bsd.gcc.mk Wed Apr 22 21:29:21 2015 (r384521) @@ -37,15 +37,14 @@ GCC_Include_MAINTAINER= gerald@FreeBSD. # ascending order and in sync with the table below. GCCVERSIONS= 040200 040600 040700 040800 040900 050000 -# The first field if the OSVERSION in which it appeared in the base. -# The second field is the OSVERSION in which it disappeared from the base. -# The third field is the version as USE_GCC would use. -GCCVERSION_040200= 700042 9999999 4.2 -GCCVERSION_040600= 0 0 4.6 -GCCVERSION_040700= 0 0 4.7 -GCCVERSION_040800= 0 0 4.8 -GCCVERSION_040900= 0 0 4.9 -GCCVERSION_050000= 0 0 5 +# The first field is the OSVERSION in which it disappeared from the base. +# The second field is the version as USE_GCC would use. +GCCVERSION_040200= 9999999 4.2 +GCCVERSION_040600= 0 4.6 +GCCVERSION_040700= 0 4.7 +GCCVERSION_040800= 0 4.8 +GCCVERSION_040900= 0 4.9 +GCCVERSION_050000= 0 5 # No configurable parts below this. #################################### # @@ -57,9 +56,7 @@ USE_GCC= ${GCC_DEFAULT}+ # Extract the fields from GCCVERSION_... .for v in ${GCCVERSIONS} . for j in ${GCCVERSION_${v}} -. if !defined(_GCCVERSION_${v}_L) -_GCCVERSION_${v}_L= ${j} -. elif !defined(_GCCVERSION_${v}_R) +. if !defined(_GCCVERSION_${v}_R) _GCCVERSION_${v}_R= ${j} . elif !defined(_GCCVERSION_${v}_V) _GCCVERSION_${v}_V= ${j} @@ -91,7 +88,7 @@ _GCC_ORLATER:= true .for v in ${GCCVERSIONS} . if exists(${LOCALBASE}/bin/gcc${_GCCVERSION_${v}_V:S/.//}) _GCC_FOUND${v}= port -. elif ${OSVERSION} >= ${_GCCVERSION_${v}_L} && ${OSVERSION} < ${_GCCVERSION_${v}_R} +. elif ${OSVERSION} < ${_GCCVERSION_${v}_R} . if exists(/usr/bin/gcc) _GCC_FOUND${v}= base . endif @@ -144,7 +141,7 @@ _USE_GCC:= ${GCC_DEFAULT} # dependencies, CC, CXX, CPP, and flags. .for v in ${GCCVERSIONS} . if ${_USE_GCC} == ${_GCCVERSION_${v}_V} -. if ${OSVERSION} < ${_GCCVERSION_${v}_L} || ${OSVERSION} > ${_GCCVERSION_${v}_R} || !exists(/usr/bin/gcc) +. 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} @@ -198,8 +195,8 @@ test-gcc: .if defined(_GCC_FOUND${v}) @echo -n "(${_GCC_FOUND${v}}) " .endif - @echo "- OSVERSION from ${_GCCVERSION_${v}_L} to ${_GCCVERSION_${v}_R}" -# @echo ${v} - ${_GCC_FOUND${v}} - ${_GCCVERSION_${v}_L} to ${_GCCVERSION_${v}_R} - ${_GCCVERSION_${v}_V} + @echo "- OSVERSION up to ${_GCCVERSION_${v}_R}" +# @echo ${v} - ${_GCC_FOUND${v}} - up to ${_GCCVERSION_${v}_R} - ${_GCCVERSION_${v}_V} .endfor @echo Using GCC version ${_USE_GCC} .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201504222129.t3MLTLut046445>