From ef91c743636268788584dafdad8d66e4cffbf8ea Mon Sep 17 00:00:00 2001 From: Bryan Drewery Date: Mon, 19 Oct 2015 20:53:15 +0000 Subject: Avoid redundantly looking up perl version when looking up dependencies or in sub-makes. With hat: portmgr --- Mk/bsd.default-versions.mk | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'Mk/bsd.default-versions.mk') 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 -- cgit v1.2.3