Skip to content

Commit

Permalink
overlay: allow to load -overlay.mk files for each USES
Browse files Browse the repository at this point in the history
This will be done before the loading of the actual USES, it allows one
to keep using the USES from the ports tree, and still provide additional
features in the overlay
  • Loading branch information
bapt committed May 10, 2021
1 parent 14d57ad commit 073b0aa
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions Mk/bsd.port.mk
Original file line number Diff line number Diff line change
Expand Up @@ -1464,6 +1464,9 @@ ${_f}_ARGS:= ${f:C/^[^\:]*(\:|\$)//:S/,/ /g}
.for f in ${USES}
.undef _usefound
.for udir in ${OVERLAYS:C,$,/Mk/Uses,} ${USESDIR}
# always include all overlay files found in each overlay
_overlayfile= ${udir}/${f:C/\:.*//}-overlay.mk
.sinclude "${_overlayfile}
_usefile= ${udir}/${f:C/\:.*//}.mk
.if exists(${_usefile}) && !defined(_usefound)
_usefound=
Expand Down

1 comment on commit 073b0aa

@asomers
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=255756 for a regression introduced by this commit.

Please sign in to comment.