Date: Thu, 16 Apr 2020 22:25:20 +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: r531883 - head/Mk Message-ID: <202004162225.03GMPKP6077031@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gerald Date: Thu Apr 16 22:25:20 2020 New Revision: 531883 URL: https://svnweb.freebsd.org/changeset/ports/531883 Log: Finalize the streamlining of data structures holding version-specific information in the light of us only encountering at most one version (GCC 4.2) in the base system these days. Modified: head/Mk/bsd.gcc.mk Modified: head/Mk/bsd.gcc.mk ============================================================================== --- head/Mk/bsd.gcc.mk Thu Apr 16 21:25:36 2020 (r531882) +++ head/Mk/bsd.gcc.mk Thu Apr 16 22:25:20 2020 (r531883) @@ -34,14 +34,8 @@ GCC_Include_MAINTAINER= gerald@FreeBSD.org # All GCC versions supported by the ports framework. Keep them in # ascending order and in sync with the table below. # When updating this, keep Mk/bsd.default-versions.mk in sync. -GCCVERSIONS= 040800 070000 080000 090000 +GCCVERSIONS= 4.8 7 8 9 -# The right side is the version as USE_GCC uses it. -_GCCVERSION_040800_V= 4.8 -_GCCVERSION_070000_V= 7 -_GCCVERSION_080000_V= 8 -_GCCVERSION_090000_V= 9 - # No configurable parts below this. #################################### # @@ -72,9 +66,9 @@ _GCC_ORLATER:= true # and save that into _GCC_FOUND. In parallel, check if USE_GCC refers # to a valid version to begin with. .for v in ${GCCVERSIONS} -. if ${_USE_GCC}==${_GCCVERSION_${v}_V} +. if ${_USE_GCC} == ${v} _GCCVERSION_OKAY= true -. if exists(${LOCALBASE}/bin/gcc${_GCCVERSION_${v}_V:S/.//}) +. if exists(${LOCALBASE}/bin/gcc${v:S/.//}) _GCC_FOUND:= ${_USE_GCC} . endif . endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202004162225.03GMPKP6077031>