Author: emaste
Date: Fri Jul 5 17:57:25 2013
New Revision: 252812
URL: http://svnweb.freebsd.org/changeset/base/252812
Log:
MFC r251601, r251685:
Handle options that override other options
Modified:
stable/9/tools/build/options/makeman
Directory Properties:
stable/9/tools/build/options/ (props changed)
Modified: stable/9/tools/build/options/makeman
==============================================================================
--- stable/9/tools/build/options/makeman Fri Jul 5 17:56:15 2013
(r252811)
+++ stable/9/tools/build/options/makeman Fri Jul 5 17:57:25 2013
(r252812)
@@ -198,7 +198,12 @@ that can be used for source builds.
.Bl -tag -width indent
EOF
show settings SRCCONF=/dev/null | sort > $t/config_default
- show with SRCCONF=/dev/null | sort > $t/config_WITH_ALL
+ # Work around WITH_LDNS_UTILS forcing BIND_UTILS off by parsing the
+ # actual config that results from enabling every WITH_ option. This
+ # can be reverted if/when we no longer have options that disable
+ # others.
+ show with SRCCONF=/dev/null | sort | sed 's/$/=/' > $t/src.conf
+ show settings SRCCONF=$t/src.conf | sort > $t/config_WITH_ALL
show without SRCCONF=/dev/null | sort > $t/config_WITHOUT_ALL
show_options |
@@ -229,6 +234,18 @@ EOF
exit 1
fi
+ show settings SRCCONF=/dev/null -D${opt} | sort >
$t/config_${opt}
+ comm -13 $t/config_default $t/config_${opt} | sed -n
"/^${opt}$/!p" |
+ comm -13 $t/deps - > $t/deps2
+
+ # Work around BIND_UTILS=no being the default when every WITH_
+ # option is enabled.
+ if [ "$(cat $t/deps2)" = WITHOUT_BIND_UTILS ]; then
+ sort $t/deps $t/deps2 > $t/_deps
+ mv $t/_deps $t/deps
+ :> $t/deps2
+ fi
+
if [ -s $t/deps ] ; then
echo 'When set, it also enforces the following options:'
echo '.Pp'
@@ -240,10 +257,6 @@ EOF
echo '.El'
fi
- show settings SRCCONF=/dev/null -D${opt} | sort >
$t/config_${opt}
- comm -13 $t/config_default $t/config_${opt} | sed -n
"/^${opt}$/!p" |
- comm -13 $t/deps - > $t/deps2
-
if [ -s $t/deps2 ] ; then
if [ -s $t/deps ] ; then
echo '.Pp'
_______________________________________________
svn-src-stable-9@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "svn-src-stable-9-unsubscr...@freebsd.org"
