Date: Sat, 16 Mar 2013 13:01:12 +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: r314352 - head/Mk Message-ID: <201303161301.r2GD1Con060141@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gerald Date: Sat Mar 16 13:01:12 2013 New Revision: 314352 URL: http://svnweb.freebsd.org/changeset/ports/314352 Log: Simplify (and strictly speaking, though not practically given version number schemes between FreeBSD and GCC, correct) the check for a valid version specified by USE_GCC. [1] If IGNORE is set, have test-gcc note that instead of showing its usual, and in that case incorrect and useless, debugging output. PR: 175252 [1] Submitted by: Yamaya Takashi <yamayan@kbh.biglobe.ne.jp> [1] Modified: head/Mk/bsd.gcc.mk Modified: head/Mk/bsd.gcc.mk ============================================================================== --- head/Mk/bsd.gcc.mk Sat Mar 16 12:51:56 2013 (r314351) +++ head/Mk/bsd.gcc.mk Sat Mar 16 13:01:12 2013 (r314352) @@ -131,11 +131,9 @@ _GCC_ORLATER:= true # Check if USE_GCC points to a valid version. .for v in ${GCCVERSIONS} -. for j in ${GCCVERSION_${v}} -. if ${_USE_GCC}==${j} +. if ${_USE_GCC}==${_GCCVERSION_${v}_V} _GCCVERSION_OKAY= true; -. endif -. endfor +. endif .endfor .if !defined(_GCCVERSION_OKAY) @@ -251,6 +249,9 @@ USE_BINUTILS= yes test-gcc: @echo USE_GCC=${USE_GCC} @echo USE_FORTRAN=${USE_FORTRAN} +.if defined(IGNORE) + @echo "IGNORE: ${IGNORE}" +.else .if defined(USE_GCC) .if defined(_GCC_ORLATER) @echo Port can use later versions. @@ -272,3 +273,4 @@ test-gcc: @echo LDFLAGS=\"${LDFLAGS}\" @echo "BUILD_DEPENDS=${BUILD_DEPENDS}" @echo "RUN_DEPENDS=${RUN_DEPENDS}" +.endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303161301.r2GD1Con060141>