svn commit: r516921 - head/Mk/Uses

[Tobias Kortkamp]

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

-------------- 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/3a421572/attachment.sig>