git: 8ba333e02eaa - main - libdtrace: Stop relying on lex compatibility

Mark Johnston markj at freebsd.org
Wed Feb 17 21:17:55 UTC 2021


On Wed, Feb 17, 2021 at 09:45:05PM +0100, Hartmann, O. wrote:
> On Wed, 17 Feb 2021 16:02:15 GMT
> Mark Johnston <markj at FreeBSD.org> wrote:
> 
> > The branch main has been updated by markj:
> > 
> > URL: https://cgit.FreeBSD.org/src/commit/?id=8ba333e02eaa59337a4e1d5534d4e894344c8226
> > 
> > commit 8ba333e02eaa59337a4e1d5534d4e894344c8226
> > Author:     Mark Johnston <markj at FreeBSD.org>
> > AuthorDate: 2021-02-17 15:49:38 +0000
> > Commit:     Mark Johnston <markj at FreeBSD.org>
> > CommitDate: 2021-02-17 15:57:19 +0000
> > 
> >     libdtrace: Stop relying on lex compatibility
> >     
> >     It does not appear to be required, and as of commit 6b7e592c215f
> >     ("lex: Do not let input() return 0 when end-of-file is reached") it
> >     causes input to return 0 instead of EOF when end-of-input is reached.
> >     
> >     PR:             253440
> >     MFC after:      3 days
> >     Sponsored by:   The FreeBSD Foundation
> > ---
> >  cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h | 2 +-
> >  cddl/lib/libdtrace/Makefile                             | 2 --
> >  2 files changed, 1 insertion(+), 3 deletions(-)
> > 
> > diff --git a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h
> > b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h index
> > f2c60a2b07d4..b3f69bb6329d 100644 ---
> > a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h +++
> > b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h @@ -717,7 +717,7 @@ extern
> > dt_pcb_t *yypcb;		/* pointer to current parser control block */ extern
> > char yyintprefix;	/* int token prefix for macros (+/-) */ extern char
> > yyintsuffix[4];	/* int token suffix ([uUlL]*) */ extern int yyintdecimal;
> > /* int token is decimal (1) or octal/hex (0) */ -extern char yytext[];
> > /* lex input buffer */ +extern char *yytext;		/* lex input buffer */
> >  extern int yylineno;		/* lex line number */
> >  extern int yydebug;		/* lex debugging */
> >  extern dt_node_t *yypragma;	/* lex token list for control lines */
> > diff --git a/cddl/lib/libdtrace/Makefile b/cddl/lib/libdtrace/Makefile
> > index efd73751e2c0..45ca1692cf48 100644
> > --- a/cddl/lib/libdtrace/Makefile
> > +++ b/cddl/lib/libdtrace/Makefile
> > @@ -129,8 +129,6 @@ SRCS+=		dis_tables.c
> >  DSRCS+=		regs_x86.d
> >  .endif
> >  
> > -LFLAGS+=-l
> > -
> >  YFLAGS+=-d
> >  
> >  LIBADD=	ctf elf proc pthread rtld_db
> > _______________________________________________
> > dev-commits-src-main at freebsd.org mailing list
> > https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main
> > To unsubscribe, send any mail to "dev-commits-src-main-unsubscribe at freebsd.org"
> 
> This commit breaks buildworld (also breask starting from scratch/clean /usr/obj):

I'm surprised that it breaks with a clean buildworld.  Can you verify
from the build logs that dt_lex.c is being re-generated during the
libdtrace build?


More information about the dev-commits-src-all mailing list