From owner-svn-ports-head@FreeBSD.ORG Wed Dec 18 17:21:50 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6D18FCEC; Wed, 18 Dec 2013 17:21:50 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4D494119D; Wed, 18 Dec 2013 17:21:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBIHLo76092267; Wed, 18 Dec 2013 17:21:50 GMT (envelope-from mva@svn.freebsd.org) Received: (from mva@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBIHLnCv092264; Wed, 18 Dec 2013 17:21:49 GMT (envelope-from mva@svn.freebsd.org) Message-Id: <201312181721.rBIHLnCv092264@svn.freebsd.org> From: Marcus von Appen Date: Wed, 18 Dec 2013 17:21:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336850 - in head: . Mk 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.17 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: Wed, 18 Dec 2013 17:21:50 -0000 Author: mva Date: Wed Dec 18 17:21:49 2013 New Revision: 336850 URL: http://svnweb.freebsd.org/changeset/ports/336850 Log: - Remove lang/python as implicit build and run dependency from bsd.python.mk Ports need to use a designated python interpreter, whether this is the default one chosen by the user (or provided by the system) and pulled in via USE_PYTHON[_BUILD|_RUN]=yes or an explicit version or version range pulled in via USE_PYTHON[_BUILD|_RUN]=X.Y does not matter. Ports should however not rely on 'python' at build or installation time, whenever possible to avoid problems with building packages for different python versions. This change tries to raise the barrier for misbehaving ports and eases package builds for different python versions. Tested with: exp-run (ports/184591) Reviewed by: wg@, koobs@ Supported by: wg@ With hat on: python@ Modified: head/CHANGES head/Mk/bsd.python.mk Modified: head/CHANGES ============================================================================== --- head/CHANGES Wed Dec 18 17:02:13 2013 (r336849) +++ head/CHANGES Wed Dec 18 17:21:49 2013 (r336850) @@ -10,6 +10,28 @@ in the release notes and/or placed into All ports committers are allowed to commit to this file. +20131218: +AUTHOR: mva@FreeBSD.org + + lang/python (and as such the 'python' binary and accomplices) + has been removed as default dependency for the USE_PYTHON, + USE_PYTHON_BUILD and USE_PYTHON_RUN knobs. + + Ports need to use a designated (default) python interpreter + to build and install and in most cases for execution in the user + environment. Ports that install python scripts, which are not + limited to a certain python version (or version range), can + include lang/python as build and/or run dependency. + + USE_PYTHON=yes and similar knobs will only pull in the + default python version (e.g. lang/python27), but none + of the meta ports or lang/python itself. + + Please use lang/python as build or run-time dependency only, + if there is no other way to get a port working properly, since + the usage of lang/python complicates package builds for different + python versions. + 20131213: AUTHOR: tijl@FreeBSD.org Modified: head/Mk/bsd.python.mk ============================================================================== --- head/Mk/bsd.python.mk Wed Dec 18 17:02:13 2013 (r336849) +++ head/Mk/bsd.python.mk Wed Dec 18 17:21:49 2013 (r336850) @@ -596,15 +596,13 @@ PYTHON_NO_DEPENDS?= NO .if ${PYTHON_NO_DEPENDS} == "NO" .if defined(USE_PYTHON_BUILD) -BUILD_DEPENDS+= ${PYTHON_CMD}:${PYTHON_PORTSDIR} \ - python:${PORTSDIR}/lang/python +BUILD_DEPENDS+= ${PYTHON_CMD}:${PYTHON_PORTSDIR} .if defined(_WANTS_META_PORT) BUILD_DEPENDS+= python${_WANTS_META_PORT}:${PORTSDIR}/lang/python${_WANTS_META_PORT} .endif .endif .if defined(USE_PYTHON_RUN) -RUN_DEPENDS+= ${PYTHON_CMD}:${PYTHON_PORTSDIR} \ - python:${PORTSDIR}/lang/python +RUN_DEPENDS+= ${PYTHON_CMD}:${PYTHON_PORTSDIR} .if defined(_WANTS_META_PORT) RUN_DEPENDS+= python${_WANTS_META_PORT}:${PORTSDIR}/lang/python${_WANTS_META_PORT} .endif