From owner-svn-src-all@freebsd.org Mon Jul 16 10:57:28 2018 Return-Path: Delivered-To: svn-src-all@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 15D70104A92F; Mon, 16 Jul 2018 10:57:28 +0000 (UTC) (envelope-from arichardson@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 B916E8B00B; Mon, 16 Jul 2018 10:57:27 +0000 (UTC) (envelope-from arichardson@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 963E81B999; Mon, 16 Jul 2018 10:57:27 +0000 (UTC) (envelope-from arichardson@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6GAvRsG023997; Mon, 16 Jul 2018 10:57:27 GMT (envelope-from arichardson@FreeBSD.org) Received: (from arichardson@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6GAvRON023995; Mon, 16 Jul 2018 10:57:27 GMT (envelope-from arichardson@FreeBSD.org) Message-Id: <201807161057.w6GAvRON023995@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: arichardson set sender to arichardson@FreeBSD.org using -f From: Alex Richardson Date: Mon, 16 Jul 2018 10:57:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r336335 - in head: lib/libnv tools/build X-SVN-Group: head X-SVN-Commit-Author: arichardson X-SVN-Commit-Paths: in head: lib/libnv tools/build X-SVN-Commit-Revision: 336335 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Jul 2018 10:57:28 -0000 Author: arichardson Date: Mon Jul 16 10:57:26 2018 New Revision: 336335 URL: https://svnweb.freebsd.org/changeset/base/336335 Log: No longer install sys/nv.h and sys/cnv.h in lib/libnv/Makefile Use tools/build/Makefile to install the headers into ${WORLDTMP}/legacy instead. Compared to r336026 this has the minor advantage that it avoids unncessary header installation when building the non-bootstrap libnv. Reviewed By: bdrewery, kevans Approved By: brooks (mentor) Differential Revision: https://reviews.freebsd.org/D16187 Modified: head/lib/libnv/Makefile head/tools/build/Makefile Modified: head/lib/libnv/Makefile ============================================================================== --- head/lib/libnv/Makefile Mon Jul 16 10:32:11 2018 (r336334) +++ head/lib/libnv/Makefile Mon Jul 16 10:57:26 2018 (r336335) @@ -17,9 +17,6 @@ SRCS+= msgio.c SRCS+= nvlist.c SRCS+= nvpair.c -INCSDIR= ${INCLUDEDIR}/sys -INCS= ${SRCTOP}/sys/sys/cnv.h ${SRCTOP}/sys/sys/nv.h - HAS_TESTS= SUBDIR.${MK_TESTS}+= tests Modified: head/tools/build/Makefile ============================================================================== --- head/tools/build/Makefile Mon Jul 16 10:32:11 2018 (r336334) +++ head/tools/build/Makefile Mon Jul 16 10:57:26 2018 (r336335) @@ -49,4 +49,7 @@ SRCS= dummy.c SUBDIR= cross-build .endif +# Needed to build config (since it uses libnv) +SYSINCS+= ${SRCTOP}/sys/sys/nv.h ${SRCTOP}/sys/sys/cnv.h + .include