From owner-freebsd-ports  Thu Mar  7 22:50: 9 2002
Delivered-To: freebsd-ports@hub.freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id 9920C37B405
	for <freebsd-ports@hub.freebsd.org>; Thu,  7 Mar 2002 22:50:00 -0800 (PST)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.11.6/8.11.6) id g286o0X51658;
	Thu, 7 Mar 2002 22:50:00 -0800 (PST)
	(envelope-from gnats)
Received: from dragon.nuxi.com (trang.nuxi.com [66.92.13.169])
	by hub.freebsd.org (Postfix) with ESMTP id 69CDD37B402
	for <FreeBSD-gnats-submit@freebsd.org>; Thu,  7 Mar 2002 22:45:40 -0800 (PST)
Received: (from obrien@localhost)
	by dragon.nuxi.com (8.11.6/8.11.1) id g286jf873732;
	Thu, 7 Mar 2002 22:45:41 -0800 (PST)
	(envelope-from obrien)
Message-Id: <200203080645.g286jf873732@dragon.nuxi.com>
Date: Thu, 7 Mar 2002 22:45:41 -0800 (PST)
From: "David O'Brien" <obrien@NUXI.com>
Reply-To: "David O'Brien" <obrien@NUXI.com>
To: FreeBSD-gnats-submit@freebsd.org
X-Send-Pr-Version: 3.113
Subject: ports/35666: new bsd.port.mk support for GCC 2.95 and 3.1
Sender: owner-freebsd-ports@FreeBSD.ORG
Precedence: bulk
List-ID: <freebsd-ports.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20freebsd-ports>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20freebsd-ports>
X-Loop: FreeBSD.org


>Number:         35666
>Category:       ports
>Synopsis:       new bsd.port.mk support for GCC 2.95 and 3.1
>Confidential:   no
>Severity:       non-critical
>Priority:       high
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Mar 07 22:50:00 PST 2002
>Closed-Date:
>Last-Modified:
>Originator:     David O'Brien
>Release:        FreeBSD 5.0-CURRENT i386
>Organization:
>Environment:
System: FreeBSD dragon.nuxi.com 5.0-CURRENT FreeBSD 5.0-CURRENT #238: Fri Feb 22 21:56:02 PST 2002 rootk@dragon.nuxi.com:/FBSD/src/sys/i386/compile/DRAGON i386


	
>Description:
	Please test and consider this more general way of stating the required
	GCC compiler.
>How-To-Repeat:
	
>Fix:

Index: bsd.port.mk
===================================================================
RCS file: /home/ncvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.400
diff -u -r1.400 bsd.port.mk
--- bsd.port.mk	24 Feb 2002 16:54:34 -0000	1.400
+++ bsd.port.mk	8 Mar 2002 06:37:05 -0000
@@ -136,9 +136,7 @@
 #				  compression.
 # USE_ZIP		- Says that the port distfile uses zip, not tar w/[bg]zip
 #				  for compression.
-# USE_GCC295	- Says that the port requires this version of gcc, either in
-#				  the system or installed from a port.
-# USE_GCC30		- Says that the port requires this version of gcc, either in
+# USE_GCC		- Says that the port requires this version of gcc, either in
 #				  the system or installed from a port.
 # USE_GMAKE		- Says that the port uses gmake.
 # GMAKE			- Set to path of GNU make if not in $PATH (default: gmake).
@@ -904,16 +902,16 @@
 .endif
 LIBTOOLFLAGS?=		--disable-ltlibs
 .endif
-.if defined(USE_GCC295) && ${OSVERSION} < 400012
+.if defined(USE_GCC) && ${USE_GCC} == 2.95 && ${OSVERSION} < 400012
 CC=				gcc295
 CXX=			g++295
 BUILD_DEPENDS+=	gcc295:${PORTSDIR}/lang/gcc295
 MAKE_ENV+=		CC=${CC} CXX=${CXX}
 .endif
-.if defined(USE_GCC30) && ${OSVERSION} < 500999
-CC=				gcc30
-CXX=			g++30
-BUILD_DEPENDS+=	gcc30:${PORTSDIR}/lang/gcc30
+.if defined(USE_GCC) && ${USE_GCC} == 3.1 && ${OSVERSION} < 500999
+CC=				gcc31
+CXX=			g++31
+BUILD_DEPENDS+=	gcc31:${PORTSDIR}/lang/gcc31
 MAKE_ENV+=		CC=${CC} CXX=${CXX}
 .endif
 
>Release-Note:
>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message