Date: Fri, 3 Aug 2012 02:28:37 +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: r301878 - head/Mk Message-ID: <201208030228.q732SbP7053825@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gerald Date: Fri Aug 3 02:28:37 2012 New Revision: 301878 URL: http://svn.freebsd.org/changeset/ports/301878 Log: Use the stable, slow moving lang/gcc instead of lang/gcc46 for USE_GCC=4.6 and USE_GCC=4.6+ and generally whenever the default version of GCC is employed. This will significantly benefit tinderboxes and the larger, reasonably conservative user base by reducing the amount of rebuilds. Rename _GCC_BUILD_DEPENDS to _GCC_PORT, but still set _GCC_BUILD_DEPENDS in the end for the sake of some ports relying on that. PR: 169449 Discussed with: bf Modified: head/Mk/bsd.gcc.mk Modified: head/Mk/bsd.gcc.mk ============================================================================== --- head/Mk/bsd.gcc.mk Fri Aug 3 02:21:37 2012 (r301877) +++ head/Mk/bsd.gcc.mk Fri Aug 3 02:28:37 2012 (r301878) @@ -178,29 +178,36 @@ _USE_GCC:= ${GCC_DEFAULT_VERSION} . if ${_USE_GCC} == ${_GCCVERSION_${v}_V} . if ${OSVERSION} < ${_GCCVERSION_${v}_L} || ${OSVERSION} > ${_GCCVERSION_${v}_R} V:= ${_GCCVERSION_${v}_V:S/.//} -_GCC_BUILD_DEPENDS:= gcc${V} _GCC_PORT_DEPENDS:= gcc${V} +. if ${_USE_GCC} == ${GCC_DEFAULT_VERSION} +_GCC_PORT:= gcc +. else +_GCC_PORT:= gcc${V} +. endif CC:= gcc${V} CXX:= g++${V} CPP:= cpp${V} . if ${_USE_GCC} != 3.4 -CFLAGS+= -Wl,-rpath=${LOCALBASE}/lib/${_GCC_BUILD_DEPENDS} -LDFLAGS+= -Wl,-rpath=${LOCALBASE}/lib/${_GCC_BUILD_DEPENDS} +CFLAGS+= -Wl,-rpath=${LOCALBASE}/lib/gcc${V} +LDFLAGS+= -Wl,-rpath=${LOCALBASE}/lib/gcc${V} . if defined (USE_FORTRAN) . if ${USE_FORTRAN} == yes -FFLAGS+= -Wl,-rpath=${LOCALBASE}/lib/${_GCC_BUILD_DEPENDS} +FFLAGS+= -Wl,-rpath=${LOCALBASE}/lib/gcc${V} . endif . endif +# The following is for the sakes of some ports which use this without +# ever telling us; to be fixed. +_GCC_BUILD_DEPENDS:= ${_GCC_PORT_DEPENDS} . endif . endif . endif .endfor .undef V -.if defined(_GCC_BUILD_DEPENDS) -BUILD_DEPENDS+= ${_GCC_PORT_DEPENDS}:${PORTSDIR}/lang/${_GCC_BUILD_DEPENDS} +.if defined(_GCC_PORT_DEPENDS) +BUILD_DEPENDS+= ${_GCC_PORT_DEPENDS}:${PORTSDIR}/lang/${_GCC_PORT} . if ${_USE_GCC} != 3.4 -RUN_DEPENDS+= ${_GCC_PORT_DEPENDS}:${PORTSDIR}/lang/${_GCC_BUILD_DEPENDS} +RUN_DEPENDS+= ${_GCC_PORT_DEPENDS}:${PORTSDIR}/lang/${_GCC_PORT} . if ${_USE_GCC} != 4.2 # Later GCC ports already depend on binutils; make sure whatever we # build leverages this as well.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201208030228.q732SbP7053825>