svn commit: r394939 - head/Mk
Mathieu Arnold
mat at FreeBSD.org
Fri Aug 21 12:02:51 UTC 2015
Author: mat
Date: Fri Aug 21 12:02:50 2015
New Revision: 394939
URL: https://svnweb.freebsd.org/changeset/ports/394939
Log:
Optimize opt_IMPLIES.
PR: 191144
Submitted by: hrs
Sponsored by: Absolight
Modified:
head/Mk/bsd.options.mk
Modified: head/Mk/bsd.options.mk
==============================================================================
--- head/Mk/bsd.options.mk Fri Aug 21 11:53:30 2015 (r394938)
+++ head/Mk/bsd.options.mk Fri Aug 21 12:02:50 2015 (r394939)
@@ -373,11 +373,37 @@ NEW_OPTIONS:= ${NEW_OPTIONS:N${opt}}
## Enable options implied by other options
# _PREVENTS is handled in bsd.port.mk:pre-check-config
-.for count in ${PORT_OPTIONS}
-. for opt in ${PORT_OPTIONS}
-PORT_OPTIONS+= ${${opt}_IMPLIES}
+## 1) Build dependency chain in A.B format:
+_DEPCHAIN=
+.for opt in ${COMPLETE_OPTIONS_LIST}
+. for o in ${${opt}_IMPLIES}
+_DEPCHAIN+= ${opt}.$o
. endfor
.endfor
+## 2) Check each dependency pair and if LHS is in PORT_OPTIONS then add RHS.
+## All of RHS of "RHS.*" (i.e. indirect dependency) are also added for
+## fast convergence.
+_PORT_OPTIONS:= ${PORT_OPTIONS}
+.for count in _0 ${COMPLETE_OPTIONS_LIST}
+### Check if all of the nested dependency are resolved already.
+. if ${count} == _0 || ${_PORT_OPTIONS} != ${PORT_OPTIONS}
+PORT_OPTIONS:= ${_PORT_OPTIONS}
+. for dc in ${_DEPCHAIN}
+. for opt in ${_PORT_OPTIONS}
+_opt=${opt}
+### Add all of direct and indirect dependency only if
+### they are not in ${PORT_OPTIONS}.
+. if !empty(_opt:M${dc:R})
+. for d in ${dc:E} ${_DEPCHAIN:M${dc:E}.*:E}
+. if empty(_PORT_OPTIONS:M$d)
+_PORT_OPTIONS+= $d
+. endif
+. endfor
+. endif
+. endfor
+. endfor
+. endif
+.endfor
# Finally, add options required by slave ports
PORT_OPTIONS+= ${OPTIONS_SLAVE}
More information about the svn-ports-all
mailing list