Date: Mon, 9 Nov 2015 18:52:19 +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: r401162 - in head/Mk: Scripts Uses Message-ID: <201511091852.tA9IqJiD003710@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Mon Nov 9 18:52:19 2015 New Revision: 401162 URL: https://svnweb.freebsd.org/changeset/ports/401162 Log: Fix partial tree checkouts with 'all-depends-list', 'make clean', etc, after inclusion of the ports_env feature into that handling around r399791. With hat: portmgr Reported by: ian, lev Modified: head/Mk/Scripts/functions.sh head/Mk/Uses/perl5.mk head/Mk/Uses/python.mk Modified: head/Mk/Scripts/functions.sh ============================================================================== --- head/Mk/Scripts/functions.sh Mon Nov 9 18:45:42 2015 (r401161) +++ head/Mk/Scripts/functions.sh Mon Nov 9 18:52:19 2015 (r401162) @@ -164,7 +164,7 @@ export_ports_env() { validate_env MAKE PORTSDIR - uses="perl5 python" + uses="python" make_env="\ _PORTS_ENV_CHECK=1 \ Modified: head/Mk/Uses/perl5.mk ============================================================================== --- head/Mk/Uses/perl5.mk Mon Nov 9 18:45:42 2015 (r401161) +++ head/Mk/Uses/perl5.mk Mon Nov 9 18:52:19 2015 (r401162) @@ -43,9 +43,7 @@ IGNORE= Incorrect 'USES+=perl5:${perl5_A 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 Modified: head/Mk/Uses/python.mk ============================================================================== --- head/Mk/Uses/python.mk Mon Nov 9 18:45:42 2015 (r401161) +++ head/Mk/Uses/python.mk Mon Nov 9 18:52:19 2015 (r401162) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201511091852.tA9IqJiD003710>