From owner-p4-projects@FreeBSD.ORG  Thu Jun 10 18:33:26 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 101691065686; Thu, 10 Jun 2010 18:33:26 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C8CA9106567E
	for <perforce@FreeBSD.org>; Thu, 10 Jun 2010 18:33:25 +0000 (UTC)
	(envelope-from andrius@FreeBSD.org)
Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id B6F568FC13
	for <perforce@FreeBSD.org>; Thu, 10 Jun 2010 18:33:25 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o5AIXPDv053073
	for <perforce@FreeBSD.org>; Thu, 10 Jun 2010 18:33:25 GMT
	(envelope-from andrius@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o5AIXP4R053071
	for perforce@freebsd.org; Thu, 10 Jun 2010 18:33:25 GMT
	(envelope-from andrius@FreeBSD.org)
Date: Thu, 10 Jun 2010 18:33:25 GMT
Message-Id: <201006101833.o5AIXP4R053071@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	andrius@FreeBSD.org using -f
From: Andrius Morkunas <andrius@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 179429 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 10 Jun 2010 18:33:26 -0000

http://p4web.freebsd.org/@@179429?ac=10

Change 179429 by andrius@klevas on 2010/06/10 18:32:41

	Add support for newer GCC versions.
	
	PORTS_CC should now be able to handle newer GCC versions like gcc44.

Affected files ...

.. //depot/projects/soc2010/clangports/ports/Mk/bsd.port.mk#4 edit

Differences ...

==== //depot/projects/soc2010/clangports/ports/Mk/bsd.port.mk#4 (text+ko) ====

@@ -1752,23 +1752,38 @@
 # PORTS_CXX should only be set if PORTS_CC is neither gcc nor clang
 PORTS_CXX?=	g++
 
-# handle USE_CC
+# Handle USE_CC
 .if defined(USE_CC)
 # Check if port requires specific compiler
-.if ${USE_CC:Mgcc*} != "" && ${USE_CC:Mclang*} == ""
+.if !empty(USE_CC:Mgcc*) && empty(USE_CC:Mclang*)
 PORTS_CC=	gcc
-.elif ${USE_CC:Mclang*} != "" && ${USE_CC:Mgcc*} == ""
+.elif !empty(USE_CC:Mclang*) && empty(USE_CC:Mgcc*)
 PORTS_CC=	clang
 .endif
 .endif
 
-.if (${PORTS_CC:M*gcc*} != "") || defined(USE_GCC)
-.if defined(USE_CC) && (${USE_CC:Mgcc*} != "")
+# Handle PORTS_CC
+# GCC
+.if !empty(PORTS_CC:M*gcc*) || defined(USE_GCC)
+# These are set early so that USE_GCC can override it later if neccessary.
+CC=			${PORTS_CC}
+CXX=		${PORTS_CC:S/cc/++/}
+
+# Translate USE_CC to USE_GCC if the former is defined.
+.if defined(USE_CC) && !empty(USE_CC:Mgcc*)
 USE_GCC=	${USE_CC:Mgcc*:S/gcc//}
 .endif
-CC=			gcc
-CXX=		g++
-.elif (${PORTS_CC:Mclang*} != "")
+
+# If USE_GCC is defined, doesn't require specific version and accepts version
+# from PORTS_CC, override USE_GCC with version from PORTS_CC.
+.if defined(USE_GCC) && !empty(USE_GCC:M*+) && !empty(PORTS_CC:Mgcc??)
+. if ${PORTS_CC:C/gcc([0-9])([0-9])/\1.\2/} > ${USE_GCC:S/+//}
+USE_GCC=${PORTS_CC:C/gcc([0-9])([0-9])/\1.\2/}
+. endif
+.endif
+
+# Clang
+.elif !empty(PORTS_CC:Mclang*)
 # TODO: handle something like USE_CLANG here when/if there's need for that
 CC=			clang
 CXX=		clang++