From delphij@frontfree.net  Fri Sep  3 15:19:59 2004
Return-Path: <delphij@frontfree.net>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 3452016A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Fri,  3 Sep 2004 15:19:59 +0000 (GMT)
Received: from mail.freebsd.org.cn (dns3.freebsd.org.cn [61.129.66.75])
	by mx1.FreeBSD.org (Postfix) with SMTP id AF30F43D2D
	for <FreeBSD-gnats-submit@freebsd.org>; Fri,  3 Sep 2004 15:19:57 +0000 (GMT)
	(envelope-from delphij@frontfree.net)
Received: (qmail 98907 invoked by uid 0); 3 Sep 2004 15:16:38 -0000
Received: from unknown (HELO beastie.frontfree.net) (219.239.98.7)
  by mail.freebsd.org.cn with SMTP; 3 Sep 2004 15:16:38 -0000
Received: from localhost (localhost.frontfree.net [127.0.0.1])
	by beastie.frontfree.net (Postfix) with ESMTP id A8010131BC9;
	Fri,  3 Sep 2004 23:19:27 +0800 (CST)
Received: from beastie.frontfree.net ([127.0.0.1])
 by localhost (beastie.frontfree.net [127.0.0.1]) (amavisd-new, port 10024)
 with ESMTP id 00304-02; Fri,  3 Sep 2004 23:19:22 +0800 (CST)
Received: by beastie.frontfree.net (Postfix, from userid 1001)
	id A048A131BC8; Fri,  3 Sep 2004 23:19:21 +0800 (CST)
Message-Id: <20040903151921.A048A131BC8@beastie.frontfree.net>
Date: Fri,  3 Sep 2004 23:19:21 +0800 (CST)
From: Xin LI <delphij@frontfree.net>
Reply-To: Xin LI <delphij@frontfree.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc: portmgr@FreeBSD.org, kan@FreeBSD.org, gerald@FreeBSD.org
Subject: [PATCH] Teach bsd.port.mk about latest gcc situations
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         71344
>Category:       ports
>Synopsis:       [PATCH] Teach bsd.port.mk about latest gcc situations
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    portmgr
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Sep 03 15:20:23 GMT 2004
>Closed-Date:    Thu Sep 30 05:31:17 GMT 2004
>Last-Modified:  Thu Sep 30 05:31:17 GMT 2004
>Originator:     Xin LI
>Release:        FreeBSD 5.2-delphij i386
>Organization:
The FreeBSD Simplified Chinese Project
>Environment:
System: FreeBSD beastie.frontfree.net 5.2-delphij FreeBSD 5.2-delphij #0: Tue Aug 17 14:22:25 CST 2004 delphij@beastie.frontfree.net:/usr/obj/usr/src/sys/BEASTIE i386


>Description:
	gcc 3.4 was imported into base on 07/28/2004 but this was not
reflected in bsd.port.mk.  Also, it doesn't recognaize recetnly added
gcc 3.5 port.

	The attached patch will change this situation.  I think it would
be good to have this committed into ports tree so it gets its way into
the upcoming FreeBSD 5.3-RELEASE
>How-To-Repeat:
	Build a port that makes use of USE_GCC=3.4
>Fix:


--- patch-bsd.port.mk begins here ---
Index: bsd.port.mk
===================================================================
RCS file: /home/ncvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.497
diff -u -r1.497 bsd.port.mk
--- bsd.port.mk	3 Aug 2004 19:03:58 -0000	1.497
+++ bsd.port.mk	3 Sep 2004 15:12:23 -0000
@@ -1325,12 +1325,19 @@
 BUILD_DEPENDS+=	gcc33:${PORTSDIR}/lang/gcc33
 GCCVERSION=		030301
 .endif
-.if ${USE_GCC} == 3.4 # Not yet available in any OSVERSION
+.if ${USE_GCC} == 3.4 && ${OSVERSION} < 502126
 CC=				gcc34
 CXX=			g++34
 F77=			g77-34
 BUILD_DEPENDS+=	gcc34:${PORTSDIR}/lang/gcc34
 GCCVERSION=		030400
+.endif
+.if ${USE_GCC} == 3.5	# Not yet available in any OSVERSION
+CC=				gcc35
+CXX=			g++35
+F77=			g77-35
+BUILD_DEPENDS+=	gcc35:${PORTSDIR}/lang/gcc35
+GCCVERSION=		030500
 .endif
 MAKE_ENV+=	CC="${CC}" CXX="${CXX}"
 .endif
--- patch-bsd.port.mk ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->portmgr 
Responsible-Changed-By: linimon 
Responsible-Changed-When: Fri Sep 3 19:45:08 GMT 2004 
Responsible-Changed-Why:  
A similar patch is already under testing, I believe (or at least 
discussion), but it is portmgr territory in any case. 

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

From: Gerald Pfeifer <gerald@pfeifer.com>
To: FreeBSD-gnats-submit@freebsd.org, Xin LI <delphij@frontfree.net>
Cc: kan@FreeBSD.org
Subject: Re: ports/71344 [PATCH] Teach bsd.port.mk about latest gcc situations
Date: Fri, 3 Sep 2004 23:51:52 +0200 (CEST)

 On Fri, 3 Sep 2004, Xin LI wrote:
 > Description:
 > 	gcc 3.4 was imported into base on 07/28/2004 but this was not
 > reflected in bsd.port.mk.  Also, it doesn't recognaize recetnly added
 > gcc 3.5 port.
 
 Thanks for Cc:ing me on this report!
 
 Concerning gcc35, there are very good chances that upstream GCC 3.5 will 
 get a different version number, and I expect to have some news in the next 
 few weeks, so we probably should wait a bit. (Also this port is currently 
 marked broken on all platforms but I'm working on that.)
 
 Gerald
 -- 
 Gerald Pfeifer (Jerry)   gerald@pfeifer.com   http://www.pfeifer.com/gerald/

Adding to audit trail by Mark Linimon:

This patch is also missing at least one test, something along the order of:
-.if ${OSVERSION} >= 501103
-.if ${OSVERSION} >= 501103 && ${OSVERSION} < 502126

I believe the patch as discussed on portmgr@ to be more complete.
State-Changed-From-To: suspended->closed 
State-Changed-By: kris 
State-Changed-When: Thu Sep 30 05:30:18 GMT 2004 
State-Changed-Why:  
Change committed. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=64316 
State-Changed-From-To: open->closed 
State-Changed-By: kris 
State-Changed-When: Thu Sep 30 05:30:18 GMT 2004 
State-Changed-Why:  
Change committed. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=70322 
State-Changed-From-To: open->closed 
State-Changed-By: kris 
State-Changed-When: Thu Sep 30 05:30:18 GMT 2004 
State-Changed-Why:  
Change committed. 

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