svn commit: r516921 - head/Mk/Uses

[Gleb Popov]

On Wed, Nov 6, 2019 at 11:02 PM Niclas Zeising <zeising at freebsd.org> 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
>
> Modified:
>   head/Mk/Uses/gl.mk
>   head/Mk/Uses/motif.mk
>   head/Mk/Uses/xorg-cat.mk
>
> Modified: head/Mk/Uses/gl.mk
>
> ==============================================================================
> --- head/Mk/Uses/gl.mk  Wed Nov  6 18:58:04 2019        (r516920)
> +++ head/Mk/Uses/gl.mk  Wed Nov  6 19:02:42 2019        (r516921)
> @@ -47,6 +47,7 @@ LIB_DEPENDS+= ${_GL_${_component}_LIB_DEPENDS}
>
>  # We only need USES=xorg if we want USE_XORG modules
>  .if defined(USE_XORG) && !empty(USE_XORG)
> +USES+=         xorg
>  .include "${USESDIR}/xorg.mk"
>  .endif
>
>
> Modified: head/Mk/Uses/motif.mk
>
> ==============================================================================
> --- head/Mk/Uses/motif.mk       Wed Nov  6 18:58:04 2019        (r516920)
> +++ head/Mk/Uses/motif.mk       Wed Nov  6 19:02:42 2019        (r516921)
> @@ -29,6 +29,7 @@ MAKE_ENV+=    MOTIFLIB="${MOTIFLIB}"
>
>  # We only need USES=xorg if we want USE_XORG modules
>  .if defined(USE_XORG) && !empty(USE_XORG)
> +USES+=         xorg
>  .include "${USESDIR}/xorg.mk"
>  .endif
>
>
> Modified: head/Mk/Uses/xorg-cat.mk
>
> ==============================================================================
> --- head/Mk/Uses/xorg-cat.mk    Wed Nov  6 18:58:04 2019        (r516920)
> +++ head/Mk/Uses/xorg-cat.mk    Wed Nov  6 19:02:42 2019        (r516921)
> @@ -179,6 +179,7 @@ USE_XORG+=  fontutil
>
>  # We only need USES=xorg if we want USE_XORG modules
>  .  if defined(USE_XORG) && !empty(USE_XORG)
> +USES+=         xorg
>  .include "${USESDIR}/xorg.mk"
>  .  endif
>
>
I've been told that one can't employ USES inside the "framework". See
cabal.mk how I included iconv there.