Date: Tue, 13 Mar 2018 21:43:29 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r464435 - in head/Mk: Scripts Uses Message-ID: <201803132143.w2DLhT8Y070197@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201803132143.w2DLhT8Y070197>