From owner-svn-src-head@freebsd.org Thu Jul 5 18:39:03 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 809B71016F2E; Thu, 5 Jul 2018 18:39:03 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 33E3E8F89D; Thu, 5 Jul 2018 18:39:03 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 150441DB77; Thu, 5 Jul 2018 18:39:03 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w65Id26o006273; Thu, 5 Jul 2018 18:39:02 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w65Id2QE006270; Thu, 5 Jul 2018 18:39:02 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <201807051839.w65Id2QE006270@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Thu, 5 Jul 2018 18:39:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r336012 - in head: . usr.sbin/config X-SVN-Group: head X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: in head: . usr.sbin/config X-SVN-Commit-Revision: 336012 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Jul 2018 18:39:03 -0000 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); } }