diff options
| author | Bryan Drewery <bdrewery@FreeBSD.org> | 2015-10-19 20:53:15 +0000 |
|---|---|---|
| committer | Bryan Drewery <bdrewery@FreeBSD.org> | 2015-10-19 20:53:15 +0000 |
| commit | ef91c743636268788584dafdad8d66e4cffbf8ea (patch) | |
| tree | 63091213218d3b0d23df38bc7637f17e143060c8 /Mk/bsd.default-versions.mk | |
| parent | 3c00f61a80325e06d323f8d431d4dfb5bdab8ff8 (diff) | |
| download | ports-ef91c743636268788584dafdad8d66e4cffbf8ea.tar.gz ports-ef91c743636268788584dafdad8d66e4cffbf8ea.zip | |
Avoid redundantly looking up perl version when looking up dependencies or in sub-makes.
With hat: portmgr
Notes
Notes:
svn path=/head/; revision=399791
Diffstat (limited to 'Mk/bsd.default-versions.mk')
| -rw-r--r-- | Mk/bsd.default-versions.mk | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk index f335a72916de..167a12c193cb 100644 --- a/Mk/bsd.default-versions.mk +++ b/Mk/bsd.default-versions.mk @@ -23,16 +23,19 @@ FPC_DEFAULT?= 2.6.4 GCC_DEFAULT?= 4.8 LUA_DEFAULT?= 5.2 MYSQL_DEFAULT?= 5.6 -.if defined(PACKAGE_BUILDING) || !exists(${LOCALBASE}/bin/perl) +.if !defined(_PORTS_ENV_CHECK) && \ + (defined(PACKAGE_BUILDING) || !exists(${LOCALBASE}/bin/perl)) PERL5_DEFAULT?= 5.20 .elif !defined(PERL5_DEFAULT) # There's no need to replace development versions, like "5.23" with "devel" # because 1) nobody is supposed to use it outside of poudriere, and 2) it must # be set manually in /etc/make.conf in the first place, and we're never getting # in here. +.if !defined(_PERL5_FROM_BIN) _PERL5_FROM_BIN!= perl -e 'printf "%vd\n", $$^V;' +.endif +_EXPORTED_VARS+= _PERL5_FROM_BIN PERL5_DEFAULT:= ${_PERL5_FROM_BIN:R} -.undef _PERL5_FROM_BIN .endif PGSQL_DEFAULT?= 9.3 PHP_DEFAULT?= 5.6 |