From owner-svn-ports-head@freebsd.org Thu Jan 14 18:54:31 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 59D69A837CF; Thu, 14 Jan 2016 18:54:31 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0DE601A5B; Thu, 14 Jan 2016 18:54:30 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0EIsTub008048; Thu, 14 Jan 2016 18:54:29 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0EIsTJc008046; Thu, 14 Jan 2016 18:54:29 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201601141854.u0EIsTJc008046@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Thu, 14 Jan 2016 18:54:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r406126 - head/Mk/Uses X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Jan 2016 18:54:31 -0000 Author: antoine Date: Thu Jan 14 18:54:29 2016 New Revision: 406126 URL: https://svnweb.freebsd.org/changeset/ports/406126 Log: Extend r405599 to make COMPILER_VERSION and ALT_COMPILER_VERSION more compatible with clang 3.8 trunk PR: 206074 With hat: portmgr Modified: head/Mk/Uses/compiler.mk head/Mk/Uses/objc.mk Modified: head/Mk/Uses/compiler.mk ============================================================================== --- head/Mk/Uses/compiler.mk Thu Jan 14 17:30:19 2016 (r406125) +++ head/Mk/Uses/compiler.mk Thu Jan 14 18:54:29 2016 (r406126) @@ -89,7 +89,11 @@ _ALTCCVERSION!= /usr/bin/clang --version _ALTCCVERSION!= /usr/bin/gcc --version .endif -ALT_COMPILER_VERSION= ${_ALTCCVERSION:M[0-9].[0-9]*:C/([0-9]).([0-9]).*/\1\2/g} +.if defined(.PARSEDIR) +ALT_COMPILER_VERSION= ${_ALTCCVERSION:M[0-9].[0-9]*:tW:C/([0-9]).([0-9]).*/\1\2/g} +.else +ALT_COMPILER_VERSION= ${_ALTCCVERSION:M[0-9].[0-9]*:C/([0-9]).([0-9]).*/\1\2/g:u} +.endif .if ${_ALTCCVERSION:Mclang} ALT_COMPILER_TYPE= clang .elif !empty(_ALTCCVERSION) Modified: head/Mk/Uses/objc.mk ============================================================================== --- head/Mk/Uses/objc.mk Thu Jan 14 17:30:19 2016 (r406125) +++ head/Mk/Uses/objc.mk Thu Jan 14 18:54:29 2016 (r406126) @@ -16,7 +16,11 @@ IGNORE= USES=objc only accepts no argume .endif _CCVERSION!= ${CC} --version -COMPILER_VERSION= ${_CCVERSION:M[0-9].[0-9]*:C/([0-9]).([0-9]).*/\1\2/g} +.if defined(.PARSEDIR) +COMPILER_VERSION= ${_CCVERSION:M[0-9].[0-9]*:tW:C/([0-9]).([0-9]).*/\1\2/g} +.else +COMPILER_VERSION= ${_CCVERSION:M[0-9].[0-9]*:C/([0-9]).([0-9]).*/\1\2/g:u} +.endif .if ${_CCVERSION:Mclang} COMPILER_TYPE= clang .else @@ -32,7 +36,11 @@ _ALTCCVERSION!= /usr/bin/clang --version _ALTCCVERSION!= /usr/bin/gcc --version .endif -ALT_COMPILER_VERSION= ${_ALTCCVERSION:M[0-9].[0-9]*:C/([0-9]).([0-9]).*/\1\2/g} +.if defined(.PARSEDIR) +ALT_COMPILER_VERSION= ${_ALTCCVERSION:M[0-9].[0-9]*:tW:C/([0-9]).([0-9]).*/\1\2/g} +.else +ALT_COMPILER_VERSION= ${_ALTCCVERSION:M[0-9].[0-9]*:C/([0-9]).([0-9]).*/\1\2/g:u} +.endif .if ${_ALTCCVERSION:Mclang} ALT_COMPILER_TYPE= clang .elif !empty(_ALTCCVERSION)