Date: Mon, 21 Jul 2014 15:14:52 +1000 From: Kubilay Kocak <koobs@FreeBSD.org> To: python@freebsd.org Cc: "svn-ports-head@freebsd.org" <svn-ports-head@freebsd.org>, Antoine Brodin <antoine@freebsd.org>, mva@freebsd.org, "svn-ports-all@freebsd.org" <svn-ports-all@freebsd.org>, "ports-committers@freebsd.org" <ports-committers@freebsd.org> Subject: Re: svn commit: r361263 - in head: . Mk Message-ID: <53CCA1CC.8090900@FreeBSD.org> In-Reply-To: <20140720231858.Horde.hH8gtABZabgnNKjWAXT_Yw7@webmail.df.eu> References: <201407081614.s68GEXP0055616@svn.freebsd.org> <CAALwa8mHv2dst-AyguonVdk%2BUEzmO9NT4UBx5LioGcy0KHGUew@mail.gmail.com> <20140720231858.Horde.hH8gtABZabgnNKjWAXT_Yw7@webmail.df.eu>
next in thread | previous in thread | raw e-mail | index | archive | help
On 21/07/2014 7:18 AM, Marcus von Appen wrote: > > Antoine Brodin <antoine@freebsd.org>: > >> On Tue, Jul 8, 2014 at 6:14 PM, Marcus von Appen <mva@freebsd.org> wrote: >>> Author: mva >>> Date: Tue Jul 8 16:14:33 2014 >>> New Revision: 361263 >>> URL: http://svnweb.freebsd.org/changeset/ports/361263 >>> QAT: https://qat.redports.org/buildarchive/r361263/ >>> >>> Log: >>> Support for installations based on the easy_install setup.py target >>> has >>> been removed from the Ports framework for Python software. The >>> PYEASYINSTALL_* knobs and support for USE_PYDISTUTILS=easy_install >>> have >>> been removed. >>> >>> Phabric: D299 >>> With hat: python@ >> >> Hi, >> >> There is a regression after this commit, more than 200 python modules >> that use USE_PYDISTUTILS=yes but don't use autoplist orphan their >> egginfo. > > Ouch! I thought that I tested everything often enough... > >>> @@ -574,10 +501,8 @@ PYDISTUTILS_EGGINFODIR?=${STAGEDIR}${PYT >>> add-plist-egginfo: >>> .if !defined(PYDISTUTILS_NOEGGINFO) && \ >>> !defined(PYDISTUTILS_AUTOPLIST) && \ >>> - (defined(INSTALLS_EGGINFO) || \ >>> - (defined(USE_PYDISTUTILS) && \ >>> - ${USE_PYDISTUTILS} != "easy_install")) && \ >>> - defined(PYTHON_REL) >>> + defined(INSTALLS_EGGINFO) && \ >>> + defined(PYTHON_REL) >>> . for egginfo in ${PYDISTUTILS_EGGINFO} >>> if [ -d "${PYDISTUTILS_EGGINFODIR}/${egginfo}" ]; then \ >>> ${LS} ${PYDISTUTILS_EGGINFODIR}/${egginfo} | while >>> read f; do \ > > The mistake seems to be here. This should be > > .if !defined(PYDISTUTILS_NOEGGINFO) && \ > !defined(PYDISTUTILS_AUTOPLIST) && \ > (defined(INSTALLS_EGGINFO) || defined(USE_PYDISTUTILS)) && \ > defined(PYTHON_REL) > ... > .endif > > I won't have the time to check and commit this in the next few days. > Can a python@'eer recheck and commit a fix please? > > Thanks > Marcus > > For reference, one of these was recently reported in math/py-numpy [1], fixed by adding INSTALLS_EGGINFO [2]. [1] https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=191865 [2] http://svnweb.freebsd.org/changeset/ports/362060
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?53CCA1CC.8090900>