diff options
| author | Bryan Drewery <bdrewery@FreeBSD.org> | 2015-11-09 18:52:19 +0000 |
|---|---|---|
| committer | Bryan Drewery <bdrewery@FreeBSD.org> | 2015-11-09 18:52:19 +0000 |
| commit | ab43229f76c8b327c1a7d4b3d6a4a2684f00bdc3 (patch) | |
| tree | b684a3fe3ee6cb90539949802e2690fea4526847 | |
| parent | 08b10f8327247049633d88ca72b8f086306b4481 (diff) | |
| download | ports-ab43229f76c8b327c1a7d4b3d6a4a2684f00bdc3.tar.gz ports-ab43229f76c8b327c1a7d4b3d6a4a2684f00bdc3.zip | |
Notes
| -rw-r--r-- | Mk/Scripts/functions.sh | 2 | ||||
| -rw-r--r-- | Mk/Uses/perl5.mk | 2 | ||||
| -rw-r--r-- | Mk/Uses/python.mk | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/Mk/Scripts/functions.sh b/Mk/Scripts/functions.sh index 05871137b1da..c39370dca819 100644 --- a/Mk/Scripts/functions.sh +++ b/Mk/Scripts/functions.sh @@ -164,7 +164,7 @@ export_ports_env() { validate_env MAKE PORTSDIR - uses="perl5 python" + uses="python" make_env="\ _PORTS_ENV_CHECK=1 \ diff --git a/Mk/Uses/perl5.mk b/Mk/Uses/perl5.mk index e76fc4e9d002..011f483163ef 100644 --- a/Mk/Uses/perl5.mk +++ b/Mk/Uses/perl5.mk @@ -43,9 +43,7 @@ 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/Uses/python.mk b/Mk/Uses/python.mk index 446da4aff3ac..7dd2d39b8897 100644 --- a/Mk/Uses/python.mk +++ b/Mk/Uses/python.mk @@ -385,10 +385,13 @@ PYTHON_MAJOR_VER= ${PYTHON_VER:R} PYTHON_REL= # empty PYTHON_ABIVER= # empty PYTHON_PORTSDIR= ${_PYTHON_RELPORTDIR}${PYTHON_SUFFIX} +# Protect partial checkouts from Mk/Scripts/functions.sh:export_ports_env(). +.if !defined(_PORTS_ENV_CHECK) || exists(${PYTHON_PORTSDIR}) .if !defined(PYTHON_PORTVERSION) PYTHON_PORTVERSION!= ${MAKE} -V PORTVERSION -C ${PYTHON_PORTSDIR} .endif _EXPORTED_VARS+= PYTHON_PORTVERSION +.endif # Create a 4 integer version string, prefixing 0 to the last token if # it's a single character. Only use the the first 3 tokens of # PORTVERSION to support pre-release versions (rc3, alpha4, etc) of |