svn commit: r338649 - head/Mk

[Rene Ladan]

Author: rene
Date: Sat Jan  4 15:49:15 2014
New Revision: 338649
URL: http://svnweb.freebsd.org/changeset/ports/338649

Log:
  Disconnect lang/gcc34 from bsd.gcc.mk, it is not used by any port anymore.
  This also removes the g77 option of USE_FORTRAN, and USE_GCC now always
  implies a dependency on binutils.
  
  Reviewed by:	bapt
  Approved by:	maintainer (gerald)

Modified:
  head/Mk/bsd.gcc.mk

Modified: head/Mk/bsd.gcc.mk
==============================================================================
--- head/Mk/bsd.gcc.mk	Sat Jan  4 15:33:14 2014	(r338648)
+++ head/Mk/bsd.gcc.mk	Sat Jan  4 15:49:15 2014	(r338649)
@@ -32,7 +32,6 @@
 # USE_FORTRAN= knob.  Here is the list of options for that knob:
 #
 #   USE_FORTRAN=	yes		# use gfortran46 (lang/gcc46)
-#   USE_FORTRAN=	g77		# use g77-34 (lang/gcc34)
 #   USE_FORTRAN=	ifort	# use the Intel compiler (lang/ifc)
 #
 # Due to object file incompatiblity between Fortran compilers, we strongly
@@ -48,12 +47,11 @@ GCC_Include_MAINTAINER=		gerald at FreeBSD.
 
 # All GCC versions supported by the ports framework.  Keep them in
 # ascending order and in sync with the table below. 
-GCCVERSIONS=	030402 040200 040400 040600 040700 040800 040900
+GCCVERSIONS=	040200 040400 040600 040700 040800 040900
 
 # 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_030402=	502126  700042 3.4
 GCCVERSION_040200=	700042 9999999 4.2
 GCCVERSION_040400=	     0       0 4.4
 GCCVERSION_040600=	     0       0 4.6
@@ -103,11 +101,6 @@ RUN_DEPENDS+=	${LOCALBASE}/intel_fc_80/b
 FC:=	${LOCALBASE}/intel_fc_80/bin/ifort
 F77:=	${LOCALBASE}/intel_fc_80/bin/ifort
 
-# g77 from lang/gcc34.
-. elif ${USE_FORTRAN} == g77
-_USE_GCC:=	3.4
-FC:=	g77-34
-F77:=	g77-34
 . else
 IGNORE=	specifies unknown value "${USE_FORTRAN}" for USE_FORTRAN
 . endif
@@ -205,7 +198,6 @@ _GCC_PORT:=		gcc${V}
 CC:=			gcc${V}
 CXX:=			g++${V}
 CPP:=			cpp${V}
-.   if ${_USE_GCC} != 3.4
 _GCC_RUNTIME:=		${LOCALBASE}/lib/gcc${V}
 CFLAGS+=		-Wl,-rpath=${_GCC_RUNTIME}
 CXXFLAGS+=		-Wl,-rpath=${_GCC_RUNTIME}
@@ -218,7 +210,6 @@ FFLAGS+=		-Wl,-rpath=${_GCC_RUNTIME}
 # 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 # ${_USE_GCC} != 3.4
 .  else # Use GCC in base.
 CC:=			gcc
 CXX:=			g++
@@ -234,12 +225,10 @@ CPP:=			cpp
 
 .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_PORT}
 # Later GCC ports already depend on binutils; make sure whatever we
 # build leverages this as well.
 USE_BINUTILS=	yes
-. endif
 .endif
 .endif # defined(_USE_GCC) && !defined(FORCE_BASE_CC_FOR_TESTING)