Silence erroneous warning about not adding USES=xorg to certain ports that get USE_XORG set from either USES=xorg-cat or USES=gl (and possibly USES=motif). There is a DEV_WARNING late in bsd.port.mk that is triggered in certain cases, because xorg-cat.mk, gl.mk and motif.mk defines USE_XORG and then include xorg.mk directly, instead of setting USES=xorg (which is not possible from within the USES infrastructure).
Fix this by instead using an internal variable _USE_XORG inside the infrastructure.
Details
- Reviewers
tobik - Group Reviewers
portmgr O5: Ports Framework - Commits
- rP516921: Mk/Uses: Add USES+=xorg when including xorg.mk
exp-run
Diff Detail
- Repository
- rP FreeBSD ports repository
- Lint
Lint Not Applicable - Unit
Tests Not Applicable
Event Timeline
LGTM
For posterity's sake here is a link back to the relevant PR: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=238988#c6
Also the exp-run PR: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=241627
Thanks for adding the links, I forgot about it when creating the diff.
It is still pending an exp-run (just to be sure).
It would be much simpler to just add xorg to USES instead of sharing private variables everywhere.
Or the DEV_WARNING should only be added to if xorg-cat, gl, motif... are not part of USES either.
Yes, however, that requires walking through the entire ports tree, which is a huge task.
But this is wrong. If a port has USES=gl (or motif, or xorg-cat) but only USE_XORG, it still needs to add USES=xorg as well.
Changing all ports to USES=xorg and removing these (same as is done for XORG_CAT), is of course the best solution. However, that will take quite some time, and I think it's a good idea to silence the broken warning while working on the proper solution.
Is it possible to get blanket approval for adding USES=xorg, gl as needed throughout the ports tree?