From owner-svn-src-head@freebsd.org Sat Jul 7 17:07:59 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 2590910358E0; Sat, 7 Jul 2018 17:07:59 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C936B8102F; Sat, 7 Jul 2018 17:07:58 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from mail-lj1-f169.google.com (mail-lj1-f169.google.com [209.85.208.169]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) (Authenticated sender: kevans) by smtp.freebsd.org (Postfix) with ESMTPSA id 6633E1A221; Sat, 7 Jul 2018 17:07:58 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: by mail-lj1-f169.google.com with SMTP id r13-v6so11225447ljg.10; Sat, 07 Jul 2018 10:07:58 -0700 (PDT) X-Gm-Message-State: APt69E25tAMUw6YughXk7ElugJq5yR62Wp5/4v0XSK6hIWvqV+YvuUtv lXHskF/oaJwweGnjcbZf9zmAD786skmll68mp7g= X-Google-Smtp-Source: AAOMgpcwsRyVXCDNCgCNzaZuNYBIGoPDPkdezStilX96R9lC44OMz3ZgIw5n0D+eQj/WOQgPA6ZjwCBCFCaBNyQROJo= X-Received: by 2002:a2e:5d88:: with SMTP id v8-v6mr9309509lje.137.1530983276884; Sat, 07 Jul 2018 10:07:56 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:a2e:5742:0:0:0:0:0 with HTTP; Sat, 7 Jul 2018 10:07:36 -0700 (PDT) In-Reply-To: <201807061123.w66BNEtb022856@repo.freebsd.org> References: <201807061123.w66BNEtb022856@repo.freebsd.org> From: Kyle Evans Date: Sat, 7 Jul 2018 12:07:36 -0500 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svn commit: r336026 - in head: lib/libnv usr.sbin/config To: Bryan Drewery Cc: src-committers , Mariusz Zaborski , svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset="UTF-8" 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: Sat, 07 Jul 2018 17:07:59 -0000 On Fri, Jul 6, 2018 at 6:23 AM, Kyle Evans wrote: > Author: kevans > Date: Fri Jul 6 11:23:14 2018 > New Revision: 336026 > URL: https://svnweb.freebsd.org/changeset/base/336026 > > Log: > config(8): Fix broken ABI > > r336019 introduced ${SRCTOP}/sys to the include paths in order to pull in a > new sys/{c,}nv.h. This is wrong, because the build tree's ABI isn't > guaranteed to match what's running on the host system. > > Fix instead by removing -I${SRCTOP}/sys and installing the libnv headers > with `make -C lib/libnv includes`... this may or may not get re-worked in > the future so that a userland lib isn't installing includes from sys/. > > Reported by: bdrewery > > Modified: > head/lib/libnv/Makefile > head/usr.sbin/config/Makefile > > Modified: head/lib/libnv/Makefile > ============================================================================== > --- head/lib/libnv/Makefile Fri Jul 6 10:13:42 2018 (r336025) > +++ head/lib/libnv/Makefile Fri Jul 6 11:23:14 2018 (r336026) > @@ -17,6 +17,9 @@ 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 > It seems that this isn't a sustainable solution, as it creates a conflict between runtime-development and libnv-development packages as both try to install these headers from sys/. If we want to use libnv from legacy build in a bootstrap tool, though, we need lib/libnv to setup INCS correctly. Is there a better solution to either only do this if we're BOOTSTRAPPING < 1200070 and staging worldtmp or just pull these from sys/sys while still allowing them to be used in kernel as expected?