diff options
| -rw-r--r-- | Mk/Scripts/functions.sh | 3 | ||||
| -rw-r--r-- | Mk/Uses/perl5.mk | 2 | ||||
| -rw-r--r-- | Mk/bsd.default-versions.mk | 7 |
3 files changed, 10 insertions, 2 deletions
diff --git a/Mk/Scripts/functions.sh b/Mk/Scripts/functions.sh index 58175d725726..f02345276a26 100644 --- a/Mk/Scripts/functions.sh +++ b/Mk/Scripts/functions.sh @@ -165,10 +165,12 @@ export_ports_env() { validate_env MAKE PORTSDIR make_env="\ + _PORTS_ENV_CHECK=1 \ PACKAGE_BUILDING=1 \ GNU_CONFIGURE=1 \ USE_JAVA=1 \ USE_LINUX=1 \ + USES=perl5 \ " make_cmd="${make_env}" @@ -187,6 +189,7 @@ export_ports_env() { _JAVA_VENDOR_LIST_REGEXP \ _JAVA_VERSION_LIST_REGEXP \ _OSRELEASE \ + _PERL5_FROM_BIN \ _PKG_CHECKED \ _SMP_CPUS \ " diff --git a/Mk/Uses/perl5.mk b/Mk/Uses/perl5.mk index 011f483163ef..e76fc4e9d002 100644 --- a/Mk/Uses/perl5.mk +++ b/Mk/Uses/perl5.mk @@ -43,7 +43,9 @@ IGNORE= Incorrect 'USES+=perl5:${perl5_ARGS}' perl5 takes no arguments USE_PERL5?= run build # remove when 5.20 goes away. +.if !defined(_PORTS_ENV_CHECK) .sinclude "${LOCALBASE}/etc/perl5_version" +.endif .if defined(PERL_VERSION) PERL5_DEPEND= ${PERL5} THIS_IS_OLD_PERL= yes 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 |