D13535.id37161.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D13535.id37161.diff
View Options

	Index: Mk/Scripts/depends-list.sh
	===================================================================
	--- Mk/Scripts/depends-list.sh
	+++ Mk/Scripts/depends-list.sh
	@@ -6,11 +6,15 @@

	. ${dp_SCRIPTSDIR}/functions.sh

	+flavors=0
	recursive=0
	missing=0
	requires_wrkdir=0
	-while getopts "mrw" FLAG; do
	+while getopts "fmrw" FLAG; do
	case "${FLAG}" in
	+ f)
	+ flavors=1
	+ ;;
	m)
	missing=1
	recursive=1
	@@ -65,7 +69,7 @@

	case "${d}" in
	@/*) ;; # Ignore @ in the path which would not be a flavor
	- @) d=${d%@*} ;;
	+ @) [ "$flavors" -eq 1 ] \|\| d=${d%@*} ;;
	esac

	case " ${checked} " in
	@@ -73,7 +77,7 @@
	esac
	checked="${checked} ${d}"
	# Check if the dependency actually exists or skip otherwise.
	- if [ ! -d ${d} ]; then
	+ if [ ! -d ${d%@*} ]; then
	echo "${dp_PKGNAME}: \"${d}\" non-existent -- dependency list incomplete" >&2
	continue
	fi
	@@ -88,11 +92,11 @@
	# Grab any needed vars from the port.

	if [ ${requires_wrkdir} -eq 1 ]; then
	- set -- $(${dp_MAKE} -C ${d} -VWRKDIR -V_UNIFIED_DEPENDS)
	+ set -- $(${dp_MAKE} -C ${d%@*} -VWRKDIR -V_UNIFIED_DEPENDS)
	wrkdir="$1"
	shift
	elif [ ${recursive} -eq 1 ]; then
	- set -- $(${dp_MAKE} -C ${d} -V_UNIFIED_DEPENDS)
	+ set -- $(${dp_MAKE} -C ${d%@*} -V_UNIFIED_DEPENDS)
	fi

	# If a WRKDIR is required to show the dependency, check for it.