From edwin@mavetju.org  Thu Jan 20 03:56:10 2005
Return-Path: <edwin@mavetju.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id D3D6616A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 20 Jan 2005 03:56:10 +0000 (GMT)
Received: from mail2out.barnet.com.au (mail2out.barnet.com.au [202.83.176.14])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 61F4043D39
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 20 Jan 2005 03:56:09 +0000 (GMT)
	(envelope-from edwin@mavetju.org)
Received: by mail2out.barnet.com.au (Postfix, from userid 27)
	id B2F65707445; Thu, 20 Jan 2005 14:56:07 +1100 (EST)
Received: from mail2-auth.barnet.com.au (mail2.barnet.com.au [202.83.176.13])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(Client CN "*.barnet.com.au", Issuer "BarNet Root Certificate Authority" (verified OK))
	by mail2.barnet.com.au (Postfix) with ESMTP id 9AB45707444
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 20 Jan 2005 14:56:06 +1100 (EST)
Received: from k7.mavetju (edwin-3.int.barnet.com.au [10.10.12.2])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(Client CN "edwin.adsl.barnet.com.au", Issuer "BarNet Root Certificate Authority" (verified OK))
	by mail2-auth.barnet.com.au (Postfix) with ESMTP id AEB2D707443
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 20 Jan 2005 14:56:05 +1100 (EST)
Received: by k7.mavetju (Postfix, from userid 1001)
	id 7E5636109; Thu, 20 Jan 2005 14:56:04 +1100 (EST)
Message-Id: <20050120035604.7E5636109@k7.mavetju>
Date: Thu, 20 Jan 2005 14:56:04 +1100 (EST)
From: Edwin Groothuis <edwin@mavetju.org>
Reply-To: Edwin Groothuis <edwin@mavetju.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [patch] introduce bsd.gcc.mk and USE_GCC=foo+
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         76489
>Category:       ports
>Synopsis:       [patch] introduce bsd.gcc.mk and USE_GCC=foo+
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    portmgr
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jan 20 04:00:47 GMT 2005
>Closed-Date:    Mon Feb 07 11:27:34 GMT 2005
>Last-Modified:  Mon Feb 07 11:27:34 GMT 2005
>Originator:     Edwin Groothuis
>Release:        FreeBSD 5.2.1-RELEASE i386
>Organization:
-
>Environment:
System: FreeBSD k7.mavetju 5.2.1-RELEASE FreeBSD 5.2.1-RELEASE #8: Wed Dec 15 16:58:01 EST 2004 edwin@k7.mavetju:/usr/src-5.2.1/sys/i386/compile/k7 i386

>Description:

USE_GCC is a nice idea, but it is too static.

For example, a port which has USE_GCC=3.2 but can live with gcc 3.3
has to recompile the whole compiler kit anyway.

>How-To-Repeat:
>Fix:

Remove everything with regarding to USE_GCC in bsd.port.mk.
Add these lines:
    .if defined(USE_GCC)
    .include "${PORTSDIR}/Mk/bsd.gcc.mk"
    .endif

And add this file to ports/Mk/bsd.gcc.mk

#-*- mode: Fundamental; tab-width: 4; -*-
# ex:ts=4
#
# bsd.gcc.mk - Support for smarter USE_GCC usage.
#
# Created by: Edwin Groothuis <edwin@freebsd.org>
#
# For port developers:
# If your port needs a specific version of GCC, you can easily specify
# that with the "USE_GCC=" statement. If you need a certain minimal version,
# but don't care if about the upperversion, just the + sign behind
# the version.
#
# For example:
#	USE_GCC=	3.3		# port requires gcc 3.3 to build with.
#	USE_GCC=	3.1+	# port requires gcc 3.1 or later to build with.
#
# If you are wondering what your port exactly does, use "make test-gcc"
# to see some debugging.
#
# $FreeBSD$
#

GCC_Include_MAINTAINER=		portmgr@FreeBSD.org

#
# All GCC versions supported by the ports framework.
# Please keep them in ascending order.
#
GCCVERSIONS=	020702 029500 030100 030200 030301 030402

#
# Versions of GCC shipped.
# The first field if the OSVERSION in which it appeared in the base system.
# The second field is the OSVERSION in which it disappeared from
# the base system.
# The third field is the version as USE_GCC would use.
#
GCCVERSION_020702=	000000 400012 2.7
GCCVERSION_029500=	400012 500035 2.95
GCCVERSION_030100=	500035 500039 3.1
GCCVERSION_030200=	500039 501103 3.2
GCCVERSION_030301=	501103 502126 3.3
GCCVERSION_030402=	502126 999999 3.4

#
# No configurable parts below this.
#

#
# See if we can use a later version
#
_USE_GCC:=	${USE_GCC:S/+//}
.if ${USE_GCC} != ${_USE_GCC}
_GCC_ORLATER:=	true
.endif

#
# Extract the fields from GCCVERSION_ and check if USE_GCC points to a valid
# version.
#
.for v in ${GCCVERSIONS}
. for j in ${GCCVERSION_${v}}
.  if !defined(_GCCVERSION_${v}_L)
_GCCVERSION_${v}_L=	${j}
.  elif !defined(_GCCVERSION_${v}_R)
_GCCVERSION_${v}_R=	${j}
.  elif !defined(_GCCVERSION_${v}_V)
_GCCVERSION_${v}_V=	${j}
.   if ${_USE_GCC}==${j}
_GCCVERSION_OKAY=	true;
.   endif
.  endif
. endfor
.endfor

.if !defined(_GCCVERSION_OKAY)
BROKEN=	"Unknown version of GCC specified (USE_GCC=${USE_GCC})"
.endif

#
# Determine current GCCVERSION
#
.for v in ${GCCVERSIONS}
. if exists(${LOCALBASE}/bin/gcc${_GCCVERSION_${v}_V:S/.//})
_GCC_FOUND${v}=	port
. endif
. if ${OSVERSION} >= ${_GCCVERSION_${v}_L} && ${OSVERSION} < ${_GCCVERSION_${v}_R}
_GCCVERSION:=		${v}
_GCC_FOUND${v}:=	base
. endif
.endfor
.if !defined(_GCCVERSION)
BROKEN=		"Couldn't find your current GCCVERSION (OSVERSION=${OSVERSION})"
.endif

#
# If the GCC package defined in USE_GCC does not exist, but a later
# version is allowed (for example 3.1+), see if there is a later.
# The first available version will be used.
#
.if defined(_GCC_ORLATER)
. for v in ${GCCVERSIONS}
.  if ${_USE_GCC} == ${_GCCVERSION_${v}_V}
_GCC_MIN:=	true
.  endif
.  if defined(_GCC_MIN) && defined(_GCC_FOUND${v}) && !defined(_GCC_FOUND)
_GCC_FOUND:=	${_GCCVERSION_${v}_V}
.  endif
. endfor
.endif
.if defined(_GCC_FOUND)
_USE_GCC:=${_GCC_FOUND}
.endif

#
# Determine if the installed OS already has this GCCVERSION, and if not
# then set BUILD_DEPENDS, CC, CXX and F77
#
.for v in ${GCCVERSIONS}
. if ${_USE_GCC} == ${_GCCVERSION_${v}_V}
.  if ${OSVERSION} < ${_GCCVERSION_${v}_L} || ${OSVERSION} > ${_GCCVERSION_${v}_R}
V:=				${_GCCVERSION_${v}_V:S/.//}
CC:=			gcc${V}
CXX:=			g++${V}
F77:=			g77-${V}
_GCC_BUILD_DEPENDS:=	${CC}
.  endif
. endif
.endfor
.undef V

.if defined(_GCC_BUILD_DEPENDS)
BUILD_DEPENDS+=	${_GCC_BUILD_DEPENDS}:${PORTSDIR}/lang/${_GCC_BUILD_DEPENDS}
.endif

MAKE_ENV+=	CC="${CC}" CXX="${CXX}"

test-gcc:
	@echo USE_GCC=${USE_GCC}
.if defined(_GCC_ORLATER)
	@echo Port can use later versions.
.else
	@echo Port cannot use later versions.
.endif
.for v in ${GCCVERSIONS}
	@echo -n "GCC version: ${_GCCVERSION_${v}_V} "
.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}
.endfor
	@echo Using GCC vesion ${_USE_GCC}
	@echo CC:${CC} - CXX:${CXX} - F77:${F77} - BUILD_DEPENDS:${BUILD_DEPENDS}
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->portmgr 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Thu Jan 20 04:01:48 GMT 2005 
Responsible-Changed-Why:  
Over to maintainer. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=76489 

From: Edwin Groothuis <edwin@mavetju.org>
To: freebsd-gnats-submit@FreeBSD.org
Cc:  
Subject: Re: ports/76489 - [patch] introduce bsd.gcc.mk and USE_GCC=foo+
Date: Tue, 1 Feb 2005 09:30:04 +1100

 Add support for gcc 4.0, as noted by user feedback.
 
 --- bsd.gcc.mk.old      Tue Feb  1 09:27:03 2005
 +++ bsd.gcc.mk  Tue Feb  1 09:25:48 2005
 @@ -24,7 +24,7 @@
  # All GCC versions supported by the ports framework.
  # Please keep them in ascending order.
  #
 -GCCVERSIONS=   020702 029500 030100 030200 030301 030402
 +GCCVERSIONS=   020702 029500 030100 030200 030301 030402 040000
  
  #
  # Versions of GCC shipped.
 @@ -39,6 +39,7 @@
  GCCVERSION_030200=     500039 501103 3.2
  GCCVERSION_030301=     501103 502126 3.3
  GCCVERSION_030402=     502126 999999 3.4
 +GCCVERSION_040000=     999999 999999 4.0
  
  #
  # No configurable parts below this.
 
 -- 
 Edwin Groothuis      |            Personal website: http://www.mavetju.org
 edwin@mavetju.org    |          Weblog: http://weblog.barnet.com.au/edwin/
State-Changed-From-To: open->closed 
State-Changed-By: krion 
State-Changed-When: Mon Feb 7 11:27:29 GMT 2005 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=76489 
>Unformatted:
