sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix overlays when using flavors.

Browse source 
Move FLAVOR processing before the overlays processing so that flavors
can be used with overlays.

PR:		247741
Submitted by:	mikael
This commit is contained in:
Mathieu Arnold 2020-07-06 11:10:16 +00:00
parent a379a9540b
commit 653dab23f7
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=541336
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Mk/Scripts/do-depends.sh
View file

@ -123,6 +123,14 @@ for _line in ${dp_RAWDEPENDS} ; do
continue continue
fi fi
case "${origin}" in
*@*/*) ;; # Ignore @ in the path which would not be a flavor
*@*)
export FLAVOR="${origin##*@}"
origin=${origin%@*}
;;
esac
case "${origin}" in case "${origin}" in
/*) ;; /*) ;;
*) *)
@ -135,13 +143,6 @@ for _line in ${dp_RAWDEPENDS} ; do
origin="${orig}" origin="${orig}"
;; ;;
esac esac
case "${origin}" in
*@*/*) ;; # Ignore @ in the path which would not be a flavor
*@*)
export FLAVOR="${origin##*@}"
origin=${origin%@*}
;;
esac
depends_args="${dp_DEPENDS_ARGS}" depends_args="${dp_DEPENDS_ARGS}"
target=${dp_DEPENDS_TARGET} target=${dp_DEPENDS_TARGET}