From owner-svn-src-all@freebsd.org Thu Sep 12 19:16:32 2019 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 96C69D7936; Thu, 12 Sep 2019 19:16:32 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from smtp-out-no.shaw.ca (smtp-out-no.shaw.ca [64.59.134.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 46TpR26lY7z4ddq; Thu, 12 Sep 2019 19:16:30 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from spqr.komquats.com ([70.67.125.17]) by shaw.ca with ESMTPA id 8UZtiVKB2sAGk8UZvidteA; Thu, 12 Sep 2019 13:16:28 -0600 X-Authority-Analysis: v=2.3 cv=WeVylHpX c=1 sm=1 tr=0 a=VFtTW3WuZNDh6VkGe7fA3g==:117 a=VFtTW3WuZNDh6VkGe7fA3g==:17 a=kj9zAlcOel0A:10 a=J70Eh1EUuV4A:10 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=OrF1C_9Q5Aj8HesGG_8A:9 a=CjuIK1q_8ugA:10 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 Received: from slippy.cwsent.com (slippy8 [10.2.2.6]) by spqr.komquats.com (Postfix) with ESMTPS id 1430B7B8; Thu, 12 Sep 2019 12:16:25 -0700 (PDT) Received: from slippy.cwsent.com (localhost [127.0.0.1]) by slippy.cwsent.com (8.15.2/8.15.2) with ESMTP id x8CJGO1l004193; Thu, 12 Sep 2019 12:16:24 -0700 (PDT) (envelope-from Cy.Schubert@cschubert.com) Received: from slippy (cy@localhost) by slippy.cwsent.com (8.15.2/8.15.2/Submit) with ESMTP id x8CJGOXB004190; Thu, 12 Sep 2019 12:16:24 -0700 (PDT) (envelope-from Cy.Schubert@cschubert.com) Message-Id: <201909121916.x8CJGOXB004190@slippy.cwsent.com> X-Authentication-Warning: slippy.cwsent.com: cy owned process doing -bs X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.7.1 Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Ian Lepore cc: Baptiste Daroussin , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r352248 - head/usr.sbin/ntp/libntp In-reply-to: <54c8efce3064f685c1948546bebaccc5f56a09c1.camel@freebsd.org> References: <201909121546.x8CFkwB7005702@repo.freebsd.org> <54c8efce3064f685c1948546bebaccc5f56a09c1.camel@freebsd.org> Comments: In-reply-to Ian Lepore message dated "Thu, 12 Sep 2019 11:53:38 -0600." Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Thu, 12 Sep 2019 12:16:24 -0700 X-CMAE-Envelope: MS4wfAc4s2qx31Y4AefuWuc5YSJ8ctj1EPEQtGO8sD8ulKptcOlEcbrl1qwPb8XQ5Zv/6jcAt4gl+qyGlMEPDSjPxl9n2iFsMTKnFN0dPfRtOroyrKZ5amW2 lLR85cEvP8mhJe8TADStMK3QQbC7ULZLfzGcSG/Fsc450KXd90puXxZ+vl4/7ekgQvkdBSP+TMc9qJEZkvboqutCU608ldxzV9rJQFK9UtIqj+vWGfdEA3IZ xr8zWkbmruY+X9LWyB4uK5HIfLtvqS56qwIRkELgrR2hlnDMQKOGXlvyeTSE9aW2AAvW41RhLFJ7GkOaHGfOXg== X-Rspamd-Queue-Id: 46TpR26lY7z4ddq X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; dkim=none; spf=none (mx1.freebsd.org: domain of cy.schubert@cschubert.com has no SPF policy when checking 64.59.134.12) smtp.mailfrom=cy.schubert@cschubert.com X-Spamd-Result: default: False [-4.00 / 15.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCVD_COUNT_FIVE(0.00)[5]; HAS_REPLYTO(0.00)[Cy.Schubert@cschubert.com]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MV_CASE(0.50)[]; MIME_GOOD(-0.10)[text/plain]; HAS_XAW(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; RWL_MAILSPIKE_GOOD(0.00)[12.134.59.64.rep.mailspike.net : 127.0.0.18]; RCPT_COUNT_FIVE(0.00)[5]; REPLYTO_EQ_FROM(0.00)[]; IP_SCORE(-2.40)[ip: (-6.45), ipnet: 64.59.128.0/20(-3.09), asn: 6327(-2.40), country: CA(-0.09)]; RCVD_IN_DNSWL_NONE(0.00)[12.134.59.64.list.dnswl.org : 127.0.5.0]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; R_SPF_NA(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:6327, ipnet:64.59.128.0/20, country:CA]; RCVD_TLS_LAST(0.00)[]; RECEIVED_SPAMHAUS_PBL(0.00)[17.125.67.70.khpj7ygk5idzvmvt5x4ziurxhy.zen.dq.spamhaus.net : 127.0.0.11] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 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: Thu, 12 Sep 2019 19:16:32 -0000 In message <54c8efce3064f685c1948546bebaccc5f56a09c1.camel@freebsd.org>, Ian Le pore writes: > On Thu, 2019-09-12 at 15:46 +0000, Baptiste Daroussin wrote: > > Author: bapt > > Date: Thu Sep 12 15:46:58 2019 > > New Revision: 352248 > > URL: https://svnweb.freebsd.org/changeset/base/352248 > > > > Log: > > Get the readline header from the installed header instead of the from the > source > > location. > > > > How can this possibly be right? One of the hallmarks of our build > system is that it is self-contained in the sense that it uses the > sources to build the sources, not sources or files from the host > machine being used to do the build. > > -- Ian > This is correct: use $DESTDIR if $SYSROOT is undefined. liebedit should already be installed in $SYSROOT by the time we get here. I'd prefer that we simply bail if $SYSROOT is undefined. -- Cheers, Cy Schubert FreeBSD UNIX: Web: http://www.FreeBSD.org The need of the many outweighs the greed of the few. > > With newer import of libedit, the path to be able to access > > readline/readline.h > > will also include header which name will conflict with some > > expected by ntp in > > another path and end up breaking the build. > > > > Modified: > > head/usr.sbin/ntp/libntp/Makefile > > > > Modified: head/usr.sbin/ntp/libntp/Makefile > > ===================================================================== > > ========= > > --- head/usr.sbin/ntp/libntp/Makefile Thu Sep 12 15:44:53 2019 > (r352 > > 247) > > +++ head/usr.sbin/ntp/libntp/Makefile Thu Sep 12 15:46:58 2019 > (r352 > > 248) > > @@ -79,7 +79,7 @@ CFLAGS+= -I${SRCTOP}/contrib/ntp/include \ > > -I${SRCTOP}/contrib/ntp/lib/isc/pthreads/include \ > > -I${SRCTOP}/contrib/ntp/sntp/libopts \ > > -I${SRCTOP}/lib/libc/${MACHINE_ARCH} \ > > - -I${SRCTOP}/lib/libedit/edit \ > > + -I${SYSROOT:U${DESTDIR}}/${INCLUDEDIR}/edit \ > > -I${.CURDIR:H} \ > > -I${.CURDIR}/ > > > > > >