Date: Thu, 12 Sep 2019 12:16:24 -0700 From: Cy Schubert <Cy.Schubert@cschubert.com> To: Ian Lepore <ian@freebsd.org> Cc: Baptiste Daroussin <bapt@FreeBSD.org>, src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r352248 - head/usr.sbin/ntp/libntp Message-ID: <201909121916.x8CJGOXB004190@slippy.cwsent.com> In-Reply-To: <54c8efce3064f685c1948546bebaccc5f56a09c1.camel@freebsd.org> References: <201909121546.x8CFkwB7005702@repo.freebsd.org> <54c8efce3064f685c1948546bebaccc5f56a09c1.camel@freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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 <Cy.Schubert@cschubert.com> FreeBSD UNIX: <cy@FreeBSD.org> 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}/ > > > > > >
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201909121916.x8CJGOXB004190>