Re: svn commit: r352248 - head/usr.sbin/ntp/libntp
On Thu, Sep 12, 2019 at 11:53:38AM -0600, Ian Lepore wrote: > On Thu, 2019-09-12 at 15:46 +, 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. > This is the regular mechanism to find things that are generated or installed during make build world. This is for example used in gnu grep for the same purpose, but also the rpc.* ofed and way more. This does not break at all the self contained nature of the buildworld! What it does is always find the headers in the right place after the install-include early phase of buildworld. Best regards, Bapt signature.asc Description: PGP signature
Re: svn commit: r352248 - head/usr.sbin/ntp/libntp
On 9/12/19 6:53 PM, Ian Lepore wrote: > On Thu, 2019-09-12 at 15:46 +, 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. I think the issue is that the readline compat headers are installed at /usr/include/edit/readline/foo.h, so you need the equivalent of -I/usr/include/edit. If there was a way to make -I honor --sysroot (e.g. -I=/usr/include/edit) then that might be the cleaner way to handle this. -- John Baldwin ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r352248 - head/usr.sbin/ntp/libntp
In message <54c8efce3064f685c1948546bebaccc5f56a09c1.ca...@freebsd.org>,
Ian Le
pore writes:
> On Thu, 2019-09-12 at 15:46 +, 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}/
> >
> >
>
>
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r352248 - head/usr.sbin/ntp/libntp
On Thu, 2019-09-12 at 15:46 +, 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
> 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}/
>
>
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r352248 - head/usr.sbin/ntp/libntp
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.
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
(r352247)
+++ head/usr.sbin/ntp/libntp/Makefile Thu Sep 12 15:46:58 2019
(r352248)
@@ -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}/
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
