From owner-svn-ports-head@freebsd.org Tue Mar 13 21:43:29 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A80D6F53268; Tue, 13 Mar 2018 21:43:29 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 5944077B10; Tue, 13 Mar 2018 21:43:29 +0000 (UTC) (envelope-from bdrewery@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5427B1F560; Tue, 13 Mar 2018 21:43:29 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2DLhT72070199; Tue, 13 Mar 2018 21:43:29 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2DLhT8Y070197; Tue, 13 Mar 2018 21:43:29 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201803132143.w2DLhT8Y070197@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Tue, 13 Mar 2018 21:43:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r464435 - in head/Mk: Scripts Uses X-SVN-Group: ports-head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: in head/Mk: Scripts Uses X-SVN-Commit-Revision: 464435 X-SVN-Commit-Repository: ports 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.25 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: Tue, 13 Mar 2018 21:43:29 -0000 Author: bdrewery Date: Tue Mar 13 21:43:28 2018 New Revision: 464435 URL: https://svnweb.freebsd.org/changeset/ports/464435 Log: Add PORTS_ENV_VARS caching support to USES=objc. Approved by: portmgr (implicit) Modified: head/Mk/Scripts/functions.sh head/Mk/Uses/objc.mk Modified: head/Mk/Scripts/functions.sh ============================================================================== --- head/Mk/Scripts/functions.sh Tue Mar 13 21:10:06 2018 (r464434) +++ head/Mk/Scripts/functions.sh Tue Mar 13 21:43:28 2018 (r464435) @@ -168,7 +168,7 @@ export_ports_env() { validate_env MAKE PORTSDIR - uses="python compiler:features" + uses="python compiler:features objc" make_env="\ _PORTS_ENV_CHECK=1 \ Modified: head/Mk/Uses/objc.mk ============================================================================== --- head/Mk/Uses/objc.mk Tue Mar 13 21:10:06 2018 (r464434) +++ head/Mk/Uses/objc.mk Tue Mar 13 21:43:28 2018 (r464435) @@ -17,7 +17,15 @@ objc_ARGS?= IGNORE= USES=objc only accepts no arguments or 'compiler' .endif +_CC_hash:= ${CC:hash} + +.if defined(_OBJC_CCVERSION_${_CC_hash}) +_CCVERSION= ${_OBJC_CCVERSION_${_CC_hash}} +.else _CCVERSION!= ${CC} --version +_OBJC_CCVERSION_${_CC_hash}= ${_CCVERSION} +PORTS_ENV_VARS+= _OBJC_CCVERSION_${_CC_hash} +.endif COMPILER_VERSION= ${_CCVERSION:M[0-9].[0-9]*:tW:C/([0-9]).([0-9]).*/\1\2/g} .if ${_CCVERSION:Mclang} COMPILER_TYPE= clang @@ -27,11 +35,17 @@ COMPILER_TYPE= gcc ALT_COMPILER_VERSION= 0 ALT_COMPILER_TYPE= none -_ALTCCVERSION= +_ALTCCVERSION= none +.if defined(_OBJC_ALTCCVERSION_${_CC_hash}) +_ALTCCVERSION= ${_OBJC_ALTCCVERSION_${_CC_hash}} +.else .if ${COMPILER_TYPE} == gcc && exists(/usr/bin/clang) _ALTCCVERSION!= /usr/bin/clang --version .elif ${COMPILER_TYPE} == clang && exists(/usr/bin/gcc) _ALTCCVERSION!= /usr/bin/gcc --version +.endif +_OBJC_ALTCCVERSION_${_CC_hash}= ${_ALTCCVERSION} +PORTS_ENV_VARS+= _OBJC_ALTCCVERSION_${_CC_hash} .endif ALT_COMPILER_VERSION= ${_ALTCCVERSION:M[0-9].[0-9]*:tW:C/([0-9]).([0-9]).*/\1\2/g}