Author: bapt
Date: Fri Sep 13 07:08:43 2019
New Revision: 352276
URL: https://svnweb.freebsd.org/changeset/base/352276
Log:
MFC r352119-r352124, r352130
Stop linking to libl by specifying we do not need yywrap
Modified:
stable/12/sbin/devd/Makefile
stable/12/sbin/devd/token.l
stable/12/usr.sbin/apmd/Makefile
stable/12/usr.sbin/apmd/apmdlex.l
stable/12/usr.sbin/config/Makefile
stable/12/usr.sbin/ctld/Makefile
stable/12/usr.sbin/ctld/token.l
stable/12/usr.sbin/jail/Makefile
stable/12/usr.sbin/jail/jaillex.l
stable/12/usr.sbin/kbdcontrol/Makefile
stable/12/usr.sbin/kbdcontrol/lex.l
stable/12/usr.sbin/ndiscvt/Makefile
stable/12/usr.sbin/ndiscvt/inf-token.l
stable/12/usr.sbin/rrenumd/Makefile
stable/12/usr.sbin/rrenumd/lexer.l
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/sbin/devd/Makefile
==============================================================================
--- stable/12/sbin/devd/Makefile Fri Sep 13 06:50:02 2019
(r352275)
+++ stable/12/sbin/devd/Makefile Fri Sep 13 07:08:43 2019
(r352276)
@@ -34,7 +34,7 @@ MAN= devd.8 devd.conf.5
NO_SHARED?=YES
-LIBADD= l util
+LIBADD= util
YFLAGS+=-v
CFLAGS+=-I. -I${.CURDIR}
Modified: stable/12/sbin/devd/token.l
==============================================================================
--- stable/12/sbin/devd/token.l Fri Sep 13 06:50:02 2019 (r352275)
+++ stable/12/sbin/devd/token.l Fri Sep 13 07:08:43 2019 (r352276)
@@ -50,6 +50,7 @@ update_lineno(const char *cp)
%}
+%option noyywrap
%option nounput
%option noinput
Modified: stable/12/usr.sbin/apmd/Makefile
==============================================================================
--- stable/12/usr.sbin/apmd/Makefile Fri Sep 13 06:50:02 2019
(r352275)
+++ stable/12/usr.sbin/apmd/Makefile Fri Sep 13 07:08:43 2019
(r352276)
@@ -10,8 +10,6 @@ PACKAGE=apm
WARNS?= 3
-LIBADD= l
-
CFLAGS+= -I${.CURDIR}
test:
Modified: stable/12/usr.sbin/apmd/apmdlex.l
==============================================================================
--- stable/12/usr.sbin/apmd/apmdlex.l Fri Sep 13 06:50:02 2019
(r352275)
+++ stable/12/usr.sbin/apmd/apmdlex.l Fri Sep 13 07:08:43 2019
(r352276)
@@ -44,6 +44,7 @@ int first_time;
%}
/* We don't need it, avoid the warning. */
+%option noyywrap
%option nounput
%option noinput
Modified: stable/12/usr.sbin/config/Makefile
==============================================================================
--- stable/12/usr.sbin/config/Makefile Fri Sep 13 06:50:02 2019
(r352275)
+++ stable/12/usr.sbin/config/Makefile Fri Sep 13 07:08:43 2019
(r352276)
@@ -18,7 +18,7 @@ CFLAGS+= -I. -I${SRCDIR}
NO_WMISSING_VARIABLE_DECLARATIONS=
-LIBADD= l nv sbuf
+LIBADD= nv sbuf
CLEANFILES+= kernconf.c
Modified: stable/12/usr.sbin/ctld/Makefile
==============================================================================
--- stable/12/usr.sbin/ctld/Makefile Fri Sep 13 06:50:02 2019
(r352275)
+++ stable/12/usr.sbin/ctld/Makefile Fri Sep 13 07:08:43 2019
(r352276)
@@ -15,7 +15,7 @@ CFLAGS+= -I${SRCTOP}/sys/dev/iscsi
#CFLAGS+= -DICL_KERNEL_PROXY
MAN= ctld.8 ctl.conf.5
-LIBADD= bsdxml l md sbuf util ucl m nv
+LIBADD= bsdxml md sbuf util ucl m nv
YFLAGS+= -v
CLEANFILES= y.tab.c y.tab.h y.output
Modified: stable/12/usr.sbin/ctld/token.l
==============================================================================
--- stable/12/usr.sbin/ctld/token.l Fri Sep 13 06:50:02 2019
(r352275)
+++ stable/12/usr.sbin/ctld/token.l Fri Sep 13 07:08:43 2019
(r352276)
@@ -45,6 +45,7 @@ extern int yylex(void);
%}
+%option noyywrap
%option noinput
%option nounput
Modified: stable/12/usr.sbin/jail/Makefile
==============================================================================
--- stable/12/usr.sbin/jail/Makefile Fri Sep 13 06:50:02 2019
(r352275)
+++ stable/12/usr.sbin/jail/Makefile Fri Sep 13 07:08:43 2019
(r352276)
@@ -6,7 +6,7 @@ PROG= jail
MAN= jail.8 jail.conf.5
SRCS= jail.c command.c config.c state.c jailp.h jaillex.l jailparse.y y.tab.h
-LIBADD= jail kvm util l
+LIBADD= jail kvm util
PACKAGE=jail
Modified: stable/12/usr.sbin/jail/jaillex.l
==============================================================================
--- stable/12/usr.sbin/jail/jaillex.l Fri Sep 13 06:50:02 2019
(r352275)
+++ stable/12/usr.sbin/jail/jaillex.l Fri Sep 13 07:08:43 2019
(r352276)
@@ -48,6 +48,7 @@ static int lineno = 1;
#define YY_DECL int yylex(void)
%}
+%option noyywrap
%option noinput
%option nounput
Modified: stable/12/usr.sbin/kbdcontrol/Makefile
==============================================================================
--- stable/12/usr.sbin/kbdcontrol/Makefile Fri Sep 13 06:50:02 2019
(r352275)
+++ stable/12/usr.sbin/kbdcontrol/Makefile Fri Sep 13 07:08:43 2019
(r352276)
@@ -8,6 +8,4 @@ SRCS= kbdcontrol.c lex.l
WARNS?= 4
CFLAGS+= -I${.CURDIR}
-LIBADD= l
-
.include <bsd.prog.mk>
Modified: stable/12/usr.sbin/kbdcontrol/lex.l
==============================================================================
--- stable/12/usr.sbin/kbdcontrol/lex.l Fri Sep 13 06:50:02 2019
(r352275)
+++ stable/12/usr.sbin/kbdcontrol/lex.l Fri Sep 13 07:08:43 2019
(r352276)
@@ -36,6 +36,7 @@
%}
+%option noyywrap
%option nounput
%option noinput
Modified: stable/12/usr.sbin/ndiscvt/Makefile
==============================================================================
--- stable/12/usr.sbin/ndiscvt/Makefile Fri Sep 13 06:50:02 2019
(r352275)
+++ stable/12/usr.sbin/ndiscvt/Makefile Fri Sep 13 07:08:43 2019
(r352276)
@@ -13,8 +13,6 @@ MAN+= ndisgen.8
WARNS?= 4
NO_WCAST_ALIGN=
-LIBADD= l
-
YFLAGS+=-v
CFLAGS+=-I. -I${.CURDIR} -I${SRCTOP}/sys
Modified: stable/12/usr.sbin/ndiscvt/inf-token.l
==============================================================================
--- stable/12/usr.sbin/ndiscvt/inf-token.l Fri Sep 13 06:50:02 2019
(r352275)
+++ stable/12/usr.sbin/ndiscvt/inf-token.l Fri Sep 13 07:08:43 2019
(r352276)
@@ -59,6 +59,7 @@ update_lineno(const char *cp)
%}
+%option noyywrap
%option nounput
%option noinput
Modified: stable/12/usr.sbin/rrenumd/Makefile
==============================================================================
--- stable/12/usr.sbin/rrenumd/Makefile Fri Sep 13 06:50:02 2019
(r352275)
+++ stable/12/usr.sbin/rrenumd/Makefile Fri Sep 13 07:08:43 2019
(r352276)
@@ -23,7 +23,7 @@ YFLAGS= -d
WARNS?= 2
-LIBADD= ipsec l y
+LIBADD= ipsec
CLEANFILES= y.tab.h
SRCS+= y.tab.h
Modified: stable/12/usr.sbin/rrenumd/lexer.l
==============================================================================
--- stable/12/usr.sbin/rrenumd/lexer.l Fri Sep 13 06:50:02 2019
(r352275)
+++ stable/12/usr.sbin/rrenumd/lexer.l Fri Sep 13 07:08:43 2019
(r352276)
@@ -60,6 +60,7 @@ void yyerror(const char *);
int yylex(void);
%}
+%option noyywrap
%option nounput
/* common section */
_______________________________________________
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"
