svn commit: r516921 - head/Mk/Uses

[Tobias Kortkamp]

On Fri, Nov 08, 2019 at 10:42:15AM +0100, Niclas Zeising wrote:
> On 2019-11-08 05:52, Tobias Kortkamp wrote:
> > On Wed, Nov 06, 2019 at 07:02:43PM +0000, Niclas Zeising wrote:
> >> Author: zeising
> >> Date: Wed Nov  6 19:02:42 2019
> >> New Revision: 516921
> >> URL: https://svnweb.freebsd.org/changeset/ports/516921
> >>
> >> Log:
> >>    Mk/Uses: Add USES+=xorg when including xorg.mk
> >>    
> >>    Add USES+=xorg to the places where MK/Uses/xorg.mk is included from other
> >>    files in the Uses infrastructure.  This is done to silence an erroneous
> >>    warning about USES=xorg not being set when using USES=gl, motif or xorg-cat,
> >>    even when it's included from the framework.
> >>    
> >>    This is a different proposal than what was originally suggested in pr 241627
> >>    and https://reviews.freebsd.org/D22210 .
> >>    
> >>    PR:		238988, 241627
> >>    Discussed with:	mat
> >>    MFH:		2019Q4
> >>    Differential Revision:	https://reviews.freebsd.org/D22210
> > 
> > Something is still wrong.  A port with for example
> > 
> > USES=	gl
> > USE_GL=	glut
> > 
> > will still give the bogus warning.  It goes away with:
> > 
> > Index: Mk/Uses/gl.mk
> > ===================================================================
> > --- Mk/Uses/gl.mk	(revision 517030)
> > +++ Mk/Uses/gl.mk	(working copy)
> > @@ -40,7 +40,9 @@
> >   .if !defined(_GL_${_component}_LIB_DEPENDS)
> >   IGNORE=		uses unknown GL component
> >   .else
> > +.if defined(_GL_${_component}_USE_XORG)
> >   USE_XORG+=	${_GL_${_component}_USE_XORG}
> > +.endif
> >   LIB_DEPENDS+=	${_GL_${_component}_LIB_DEPENDS}
> >   .endif
> >   .endfor
> > 
> 
> Ok, I have to look into this as well, but your patch is probably good.
> I wonder if this is still needed after the warnings in bsd.port.mk are 
> removed (since I've tried to move everything to USES).
> Do you have an example of a port that's an issue?

Here are some ports that have this problem (might be behind non-default
options):

$ rg -l GL=glut
graphics/pfstools/Makefile
[...]
graphics/webp/Makefile
[...]
games/d2x/Makefile
^C

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 618 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/svn-ports-head/attachments/20191108/17bce47d/attachment.sig>