From owner-svn-ports-all@freebsd.org Mon Oct 19 20:53:17 2015 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5B718A19F50; Mon, 19 Oct 2015 20:53:17 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0B23B25D; Mon, 19 Oct 2015 20:53:16 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9JKrGow043421; Mon, 19 Oct 2015 20:53:16 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9JKrF66043418; Mon, 19 Oct 2015 20:53:15 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201510192053.t9JKrF66043418@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Mon, 19 Oct 2015 20:53:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r399791 - in head/Mk: . Scripts Uses X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Oct 2015 20:53:17 -0000 Author: bdrewery Date: Mon Oct 19 20:53:15 2015 New Revision: 399791 URL: https://svnweb.freebsd.org/changeset/ports/399791 Log: Avoid redundantly looking up perl version when looking up dependencies or in sub-makes. With hat: portmgr Modified: head/Mk/Scripts/functions.sh head/Mk/Uses/perl5.mk head/Mk/bsd.default-versions.mk Modified: head/Mk/Scripts/functions.sh ============================================================================== --- head/Mk/Scripts/functions.sh Mon Oct 19 20:23:01 2015 (r399790) +++ head/Mk/Scripts/functions.sh Mon Oct 19 20:53:15 2015 (r399791) @@ -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 \ " Modified: head/Mk/Uses/perl5.mk ============================================================================== --- head/Mk/Uses/perl5.mk Mon Oct 19 20:23:01 2015 (r399790) +++ head/Mk/Uses/perl5.mk Mon Oct 19 20:53:15 2015 (r399791) @@ -43,7 +43,9 @@ 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/bsd.default-versions.mk ============================================================================== --- head/Mk/bsd.default-versions.mk Mon Oct 19 20:23:01 2015 (r399790) +++ head/Mk/bsd.default-versions.mk Mon Oct 19 20:53:15 2015 (r399791) @@ -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