Author: kevans
Date: Thu Jul 5 18:39:02 2018
New Revision: 336012
URL: https://svnweb.freebsd.org/changeset/base/336012
Log:
Fix build after r336011
Add libnv to bootstrap-tools, use ${SRCTOP}/sys headers.
Modified:
head/Makefile.inc1
head/usr.sbin/config/Makefile
head/usr.sbin/config/mkmakefile.c
Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1 Thu Jul 5 17:53:51 2018 (r336011)
+++ head/Makefile.inc1 Thu Jul 5 18:39:02 2018 (r336012)
@@ -2063,6 +2063,15 @@ _kerberos5_bootstrap_tools= \
.ORDER: ${_kerberos5_bootstrap_tools:C/^/${_bt}-/g}
.endif
+# Later config(8) requires newer libnv cnvlist* API
+.if ${BOOTSTRAPPING} < 1200070
+_config= \
+ lib/libnv \
+ usr.sbin/config
+.else
+_config= usr.sbin/config
+.endif
+
${_bt}-usr.bin/mandoc: ${_bt}-lib/libopenbsd
bootstrap-tools: .PHONY
@@ -2087,7 +2096,7 @@ bootstrap-tools: .PHONY
${_lex} \
usr.bin/xinstall \
${_gensnmptree} \
- usr.sbin/config \
+ ${_config} \
${_crunchide} \
${_crunchgen} \
${_nmtree} \
Modified: head/usr.sbin/config/Makefile
==============================================================================
--- head/usr.sbin/config/Makefile Thu Jul 5 17:53:51 2018
(r336011)
+++ head/usr.sbin/config/Makefile Thu Jul 5 18:39:02 2018
(r336012)
@@ -14,7 +14,7 @@ kernconf.c: kernconf.tmpl
${FILE2C} 'char kernconfstr[] = {' ',0};' < \
${SRCDIR}/kernconf.tmpl > kernconf.c
-CFLAGS+= -I. -I${SRCDIR}
+CFLAGS+= -I. -I${SRCDIR} -I${SRCTOP}/sys
NO_WMISSING_VARIABLE_DECLARATIONS=
Modified: head/usr.sbin/config/mkmakefile.c
==============================================================================
--- head/usr.sbin/config/mkmakefile.c Thu Jul 5 17:53:51 2018
(r336011)
+++ head/usr.sbin/config/mkmakefile.c Thu Jul 5 18:39:02 2018
(r336012)
@@ -286,7 +286,7 @@ dump_nvlist(nvlist_t *nvl, FILE *ofp)
fprintf(ofp, "\"%s=%s\\0\"\n", name,
cnvlist_get_string(cookie));
- cnvlist_free_string(nvl, cookie);
+ cnvlist_free_string(cookie);
}
}
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "[email protected]"
