Antoine Jacoutot <ajacou...@bsdfrog.org> writes:
> On Sun, Aug 31, 2014 at 07:52:45PM +0200, Jérémie Courrèges-Anglas wrote:
>>
>> Hi,
>>
>> while looking at the duplicity-0.6.24 update I noticed that
>> py-setuptools can end up in MODPY_LIB_DEPENDS. This is due to a quirk
>> in python.port.mk: py-setuptools gets added to MODPY_RUN_DEPENDS, but
>> the latter is used to define MODPY_LIB_DEPENDS, and since make(1) is
>> a lazy naughty boy...
>>
>> Now I guess that _MODPY_BUILD_DEPENDS could get the same modification,
>> since py-setuptools gets directly added to BUILD_DEPENDS. Looks like
>> MODPY_TKINTER_DEPENDS needs a fix too, but I'd rather test the following
>> diff first.
>
> Your diff removes py-setuptools runtime dependency, no?
> If so, I don't think this is right.
Unless I misread python.port.mk, no.
py-setuptools still gets added to MODPY_RUN_DEPENDS and BUILD_DEPENDS.
That doesn't change. What changes is that MODPY_LIB_DEPENDS doesn't end
up containing py-setuptools(1), which is wrong, and BUILD_DEPENDS ends
up with only one occurrence of py-setuptools instead of two - see lines
89 and 90. sqlports agrees that all py-setuptools/py-distribute entries
in build_depends are duplicated.
> Also if this variable changes, you need to audit the tree and bump ports that
> use it.
All deps on py-setuptools/py-distribute in the tree happen through
MODPY_SETUPTOOLS=Yes, says grep. None of the ports that use
MODPY_SETUPTOOLS=Yes also use MODPY_LIB_DEPENDS for LIB_DEPENDS(2), the
same goes for _MODPY_BUILD_DEPENDS.
So with (1) and (2) I think that bumps are not needed and that this diff
only is enough. But I can bump all users of MODPY_LIB_DEPENDS /
_MODPY_BUILD_DEPENDS if desired (< 60 ports).
Index: python.port.mk
===================================================================
RCS file: /cvs/ports/lang/python/python.port.mk,v
retrieving revision 1.75
diff -u -p -p -u -r1.75 python.port.mk
--- python.port.mk 3 Jun 2014 11:29:32 -0000 1.75
+++ python.port.mk 1 Sep 2014 12:06:01 -0000
@@ -59,8 +59,8 @@ MODPY_COMMENT =
MODPY_WANTLIB = python${MODPY_VERSION}${MODPY_LIB_SUFFIX}
MODPY_RUN_DEPENDS = lang/python/${MODPY_VERSION}
-MODPY_LIB_DEPENDS = ${MODPY_RUN_DEPENDS}
-_MODPY_BUILD_DEPENDS = ${MODPY_RUN_DEPENDS}
+MODPY_LIB_DEPENDS = lang/python/${MODPY_VERSION}
+_MODPY_BUILD_DEPENDS = lang/python/${MODPY_VERSION}
MODPY_BUILDDEP ?= Yes
MODPY_RUNDEP ?= Yes
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
