From owner-svn-ports-head@freebsd.org Tue Dec 29 12:03:12 2015 Return-Path: Delivered-To: svn-ports-head@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 2ABE5A546CC; Tue, 29 Dec 2015 12:03:12 +0000 (UTC) (envelope-from marino@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 DC9701D92; Tue, 29 Dec 2015 12:03:11 +0000 (UTC) (envelope-from marino@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBTC3AXb013080; Tue, 29 Dec 2015 12:03:10 GMT (envelope-from marino@FreeBSD.org) Received: (from marino@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBTC39n2013069; Tue, 29 Dec 2015 12:03:09 GMT (envelope-from marino@FreeBSD.org) Message-Id: <201512291203.tBTC39n2013069@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: marino set sender to marino@FreeBSD.org using -f From: John Marino Date: Tue, 29 Dec 2015 12:03:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r404739 - in head: Mk/Uses lang/python27 lang/python32 lang/python33 lang/python34 lang/python35 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Dec 2015 12:03:12 -0000 Author: marino Date: Tue Dec 29 12:03:09 2015 New Revision: 404739 URL: https://svnweb.freebsd.org/changeset/ports/404739 Log: lang/python27(3*), Mk/Uses/python.mk: remove make spawn There are some inefficiencies in python.mk that significantly slow down full tree scanning. The use of bmake to obtain the current version of a specific python is responsible for the majority of the slow done. This commit splits out the PYTHON_PORTVERSION definition (which is the same as the lang/python* PORTVERSION) into separate files. With this change, python.mk can simple include the makefile fragment instead of spawning a new instance of make. Different Revision: https://reviews.freebsd.org/D4660 Approved by: antoine (python), mva (python) Added: head/lang/python27/Makefile.version (contents, props changed) head/lang/python32/Makefile.version (contents, props changed) head/lang/python33/Makefile.version (contents, props changed) head/lang/python34/Makefile.version (contents, props changed) head/lang/python35/Makefile.version (contents, props changed) Modified: head/Mk/Uses/python.mk head/lang/python27/Makefile head/lang/python32/Makefile head/lang/python33/Makefile head/lang/python34/Makefile head/lang/python35/Makefile Modified: head/Mk/Uses/python.mk ============================================================================== --- head/Mk/Uses/python.mk Tue Dec 29 11:56:20 2015 (r404738) +++ head/Mk/Uses/python.mk Tue Dec 29 12:03:09 2015 (r404739) @@ -387,7 +387,7 @@ 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}) -PYTHON_PORTVERSION!= ${MAKE} -V PORTVERSION -C ${PYTHON_PORTSDIR} +.include "${PYTHON_PORTSDIR}/Makefile.version" .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 Modified: head/lang/python27/Makefile ============================================================================== --- head/lang/python27/Makefile Tue Dec 29 11:56:20 2015 (r404738) +++ head/lang/python27/Makefile Tue Dec 29 12:03:09 2015 (r404739) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= python27 -PORTVERSION= 2.7.11 +PORTVERSION= ${PYTHON_PORTVERSION} CATEGORIES= lang python ipv6 MASTER_SITES= PYTHON/ftp/python/${PORTVERSION} DISTNAME= Python-${PORTVERSION} @@ -73,6 +73,7 @@ THREADS_LDFLAGS= -lpthread UCS2_CONFIGURE_ON= --enable-unicode=ucs2 UCS4_CONFIGURE_ON= --enable-unicode=ucs4 +.include "${.CURDIR}/Makefile.version" .include # http://bugs.python.org/issue22521 Added: head/lang/python27/Makefile.version ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/python27/Makefile.version Tue Dec 29 12:03:09 2015 (r404739) @@ -0,0 +1,4 @@ +# Mk/Uses/python.mk includes this file, don't remove it! +# $FreeBSD$ + +PYTHON_PORTVERSION= 2.7.11 Modified: head/lang/python32/Makefile ============================================================================== --- head/lang/python32/Makefile Tue Dec 29 11:56:20 2015 (r404738) +++ head/lang/python32/Makefile Tue Dec 29 12:03:09 2015 (r404739) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= python32 -PORTVERSION= 3.2.6 +PORTVERSION= ${PYTHON_PORTVERSION} CATEGORIES= lang python ipv6 MASTER_SITES= PYTHON/ftp/python/${PORTVERSION} DISTNAME= Python-${PORTVERSION} @@ -71,6 +71,7 @@ THREADS_LDFLAGS= -lpthread TSC_CONFIGURE_WITH= tsc UCS4_CONFIGURE_WITH= wide-unicode +.include "${.CURDIR}/Makefile.version" .include .if ${PORT_OPTIONS:MUCS4} Added: head/lang/python32/Makefile.version ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/python32/Makefile.version Tue Dec 29 12:03:09 2015 (r404739) @@ -0,0 +1,4 @@ +# Mk/Uses/python.mk includes this file, don't remove it! +# $FreeBSD$ + +PYTHON_PORTVERSION= 3.2.6 Modified: head/lang/python33/Makefile ============================================================================== --- head/lang/python33/Makefile Tue Dec 29 11:56:20 2015 (r404738) +++ head/lang/python33/Makefile Tue Dec 29 12:03:09 2015 (r404739) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= python33 -PORTVERSION= 3.3.6 +PORTVERSION= ${PYTHON_PORTVERSION} PORTREVISION= 2 CATEGORIES= lang python ipv6 MASTER_SITES= PYTHON/ftp/python/${PORTVERSION} @@ -73,6 +73,7 @@ THREADS_LDFLAGS= -lpthread TSC_CONFIGURE_WITH= tsc +.include "${.CURDIR}/Makefile.version" .include .if ${PORT_OPTIONS:MPYMALLOC} Added: head/lang/python33/Makefile.version ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/python33/Makefile.version Tue Dec 29 12:03:09 2015 (r404739) @@ -0,0 +1,4 @@ +# Mk/Uses/python.mk includes this file, don't remove it! +# $FreeBSD$ + +PYTHON_PORTVERSION= 3.3.6 Modified: head/lang/python34/Makefile ============================================================================== --- head/lang/python34/Makefile Tue Dec 29 11:56:20 2015 (r404738) +++ head/lang/python34/Makefile Tue Dec 29 12:03:09 2015 (r404739) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= python34 -PORTVERSION= 3.4.3 +PORTVERSION= ${PYTHON_PORTVERSION} PORTREVISION= 2 CATEGORIES= lang python ipv6 MASTER_SITES= PYTHON/ftp/python/${PORTVERSION} @@ -82,6 +82,7 @@ THREADS_LDFLAGS= -lpthread TSC_CONFIGURE_WITH= tsc +.include "${.CURDIR}/Makefile.version" .include .if ${PORT_OPTIONS:MPYMALLOC} Added: head/lang/python34/Makefile.version ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/python34/Makefile.version Tue Dec 29 12:03:09 2015 (r404739) @@ -0,0 +1,4 @@ +# Mk/Uses/python.mk includes this file, don't remove it! +# $FreeBSD$ + +PYTHON_PORTVERSION= 3.4.3 Modified: head/lang/python35/Makefile ============================================================================== --- head/lang/python35/Makefile Tue Dec 29 11:56:20 2015 (r404738) +++ head/lang/python35/Makefile Tue Dec 29 12:03:09 2015 (r404739) @@ -2,9 +2,9 @@ # $FreeBSD$ PORTNAME= python -DISTVERSION= 3.5.1 +DISTVERSION= ${PYTHON_PORTVERSION} CATEGORIES= lang python ipv6 -MASTER_SITES= PYTHON/ftp/python/${DISTVERSION:C/^([0-9]+\.[0-9]+\.[0-9]+).*/\1/} +MASTER_SITES= PYTHON/ftp/python/${PYTHON_PORTVERSION} PKGNAMESUFFIX= ${PYTHON_SUFFIX} DISTNAME= Python-${DISTVERSION} DIST_SUBDIR= python @@ -24,7 +24,6 @@ CPE_PRODUCT= ${CPE_VENDOR} CPE_VERSION= ${DISTVERSION} # Duplicate python.mk variables. TODO: Let lang/python?? ports use python.mk bits. -PYTHON_PORTVERSION= ${DISTVERSION:C/^([0-9]+\.[0-9]+\.[0-9]+).*/\1/} PYTHON_VER= ${PYTHON_PORTVERSION:R} PYTHON_VERSION= python${PYTHON_VER} PYTHON_SUFFIX= ${PYTHON_VER:S/.//g} @@ -89,6 +88,7 @@ THREADS_LDFLAGS= -lpthread TSC_CONFIGURE_WITH= tsc +.include "${.CURDIR}/Makefile.version" .include .if ${PORT_OPTIONS:MPYMALLOC} Added: head/lang/python35/Makefile.version ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/python35/Makefile.version Tue Dec 29 12:03:09 2015 (r404739) @@ -0,0 +1,4 @@ +# Mk/Uses/python.mk includes this file, don't remove it! +# $FreeBSD$ + +PYTHON_PORTVERSION= 3.5.1