Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 13 Sep 2019 07:21:06 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject:   svn commit: r352280 - in stable/11: sbin/devd usr.sbin/apmd usr.sbin/config usr.sbin/ctld usr.sbin/jail usr.sbin/kbdcontrol usr.sbin/ndiscvt usr.sbin/rrenumd
Message-ID:  <201909130721.x8D7L6DC054878@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bapt
Date: Fri Sep 13 07:21:06 2019
New Revision: 352280
URL: https://svnweb.freebsd.org/changeset/base/352280

Log:
  MFC r352119-r352124, r352130
  
  Stop linking to libl by specifying we do not need yywrap

Modified:
  stable/11/sbin/devd/Makefile
  stable/11/sbin/devd/token.l
  stable/11/usr.sbin/apmd/Makefile
  stable/11/usr.sbin/apmd/apmdlex.l
  stable/11/usr.sbin/config/Makefile
  stable/11/usr.sbin/ctld/Makefile
  stable/11/usr.sbin/ctld/token.l
  stable/11/usr.sbin/jail/Makefile
  stable/11/usr.sbin/jail/jaillex.l
  stable/11/usr.sbin/kbdcontrol/Makefile
  stable/11/usr.sbin/kbdcontrol/lex.l
  stable/11/usr.sbin/ndiscvt/Makefile
  stable/11/usr.sbin/ndiscvt/inf-token.l
  stable/11/usr.sbin/rrenumd/Makefile
  stable/11/usr.sbin/rrenumd/lexer.l
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sbin/devd/Makefile
==============================================================================
--- stable/11/sbin/devd/Makefile	Fri Sep 13 07:18:32 2019	(r352279)
+++ stable/11/sbin/devd/Makefile	Fri Sep 13 07:21:06 2019	(r352280)
@@ -11,7 +11,7 @@ WARNS?=	3
 
 NO_SHARED?=YES
 
-LIBADD=	l util
+LIBADD=	util
 
 YFLAGS+=-v
 CFLAGS+=-I. -I${.CURDIR}

Modified: stable/11/sbin/devd/token.l
==============================================================================
--- stable/11/sbin/devd/token.l	Fri Sep 13 07:18:32 2019	(r352279)
+++ stable/11/sbin/devd/token.l	Fri Sep 13 07:21:06 2019	(r352280)
@@ -50,6 +50,7 @@ update_lineno(const char *cp)
 
 %}
 
+%option noyywrap
 %option nounput
 %option noinput
 

Modified: stable/11/usr.sbin/apmd/Makefile
==============================================================================
--- stable/11/usr.sbin/apmd/Makefile	Fri Sep 13 07:18:32 2019	(r352279)
+++ stable/11/usr.sbin/apmd/Makefile	Fri Sep 13 07:21:06 2019	(r352280)
@@ -9,8 +9,6 @@ PACKAGE=apm
 
 WARNS?=	3
 
-LIBADD=	l
-
 CFLAGS+= -I${.CURDIR}
 
 test:

Modified: stable/11/usr.sbin/apmd/apmdlex.l
==============================================================================
--- stable/11/usr.sbin/apmd/apmdlex.l	Fri Sep 13 07:18:32 2019	(r352279)
+++ stable/11/usr.sbin/apmd/apmdlex.l	Fri Sep 13 07:21:06 2019	(r352280)
@@ -44,6 +44,7 @@ int first_time;
 %}
 
 /* We don't need it, avoid the warning. */
+%option noyywrap
 %option nounput
 %option noinput
 

Modified: stable/11/usr.sbin/config/Makefile
==============================================================================
--- stable/11/usr.sbin/config/Makefile	Fri Sep 13 07:18:32 2019	(r352279)
+++ stable/11/usr.sbin/config/Makefile	Fri Sep 13 07:21:06 2019	(r352280)
@@ -18,7 +18,7 @@ CFLAGS+= -I. -I${SRCDIR}
 
 NO_WMISSING_VARIABLE_DECLARATIONS=
 
-LIBADD=	l nv sbuf
+LIBADD=	nv sbuf
 
 CLEANFILES+=	kernconf.c
 

Modified: stable/11/usr.sbin/ctld/Makefile
==============================================================================
--- stable/11/usr.sbin/ctld/Makefile	Fri Sep 13 07:18:32 2019	(r352279)
+++ stable/11/usr.sbin/ctld/Makefile	Fri Sep 13 07:21:06 2019	(r352280)
@@ -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
+LIBADD=		bsdxml md sbuf util ucl m
 
 YFLAGS+=	-v
 CLEANFILES=	y.tab.c y.tab.h y.output

Modified: stable/11/usr.sbin/ctld/token.l
==============================================================================
--- stable/11/usr.sbin/ctld/token.l	Fri Sep 13 07:18:32 2019	(r352279)
+++ stable/11/usr.sbin/ctld/token.l	Fri Sep 13 07:21:06 2019	(r352280)
@@ -45,6 +45,7 @@ extern int	yylex(void);
 
 %}
 
+%option noyywrap
 %option noinput
 %option nounput
 

Modified: stable/11/usr.sbin/jail/Makefile
==============================================================================
--- stable/11/usr.sbin/jail/Makefile	Fri Sep 13 07:18:32 2019	(r352279)
+++ stable/11/usr.sbin/jail/Makefile	Fri Sep 13 07:21:06 2019	(r352280)
@@ -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/11/usr.sbin/jail/jaillex.l
==============================================================================
--- stable/11/usr.sbin/jail/jaillex.l	Fri Sep 13 07:18:32 2019	(r352279)
+++ stable/11/usr.sbin/jail/jaillex.l	Fri Sep 13 07:21:06 2019	(r352280)
@@ -48,6 +48,7 @@ static int lineno = 1;
 #define YY_DECL int yylex(void)
 %}
 
+%option noyywrap
 %option noinput
 %option nounput
 

Modified: stable/11/usr.sbin/kbdcontrol/Makefile
==============================================================================
--- stable/11/usr.sbin/kbdcontrol/Makefile	Fri Sep 13 07:18:32 2019	(r352279)
+++ stable/11/usr.sbin/kbdcontrol/Makefile	Fri Sep 13 07:21:06 2019	(r352280)
@@ -8,6 +8,4 @@ SRCS=	kbdcontrol.c lex.l
 WARNS?=	4
 CFLAGS+= -I${.CURDIR}
 
-LIBADD=	l
-
 .include <bsd.prog.mk>

Modified: stable/11/usr.sbin/kbdcontrol/lex.l
==============================================================================
--- stable/11/usr.sbin/kbdcontrol/lex.l	Fri Sep 13 07:18:32 2019	(r352279)
+++ stable/11/usr.sbin/kbdcontrol/lex.l	Fri Sep 13 07:21:06 2019	(r352280)
@@ -36,6 +36,7 @@
 
 %}
 
+%option noyywrap
 %option nounput
 %option noinput
 

Modified: stable/11/usr.sbin/ndiscvt/Makefile
==============================================================================
--- stable/11/usr.sbin/ndiscvt/Makefile	Fri Sep 13 07:18:32 2019	(r352279)
+++ stable/11/usr.sbin/ndiscvt/Makefile	Fri Sep 13 07:21:06 2019	(r352280)
@@ -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/11/usr.sbin/ndiscvt/inf-token.l
==============================================================================
--- stable/11/usr.sbin/ndiscvt/inf-token.l	Fri Sep 13 07:18:32 2019	(r352279)
+++ stable/11/usr.sbin/ndiscvt/inf-token.l	Fri Sep 13 07:21:06 2019	(r352280)
@@ -57,6 +57,7 @@ update_lineno(const char *cp)
 
 %}
 
+%option noyywrap
 %option nounput
 %option noinput
 

Modified: stable/11/usr.sbin/rrenumd/Makefile
==============================================================================
--- stable/11/usr.sbin/rrenumd/Makefile	Fri Sep 13 07:18:32 2019	(r352279)
+++ stable/11/usr.sbin/rrenumd/Makefile	Fri Sep 13 07:21:06 2019	(r352280)
@@ -23,7 +23,7 @@ YFLAGS=	-d
 
 WARNS?=	2
 
-LIBADD=	ipsec l y
+LIBADD=	ipsec
 
 CLEANFILES=	y.tab.h
 SRCS+=	y.tab.h

Modified: stable/11/usr.sbin/rrenumd/lexer.l
==============================================================================
--- stable/11/usr.sbin/rrenumd/lexer.l	Fri Sep 13 07:18:32 2019	(r352279)
+++ stable/11/usr.sbin/rrenumd/lexer.l	Fri Sep 13 07:21:06 2019	(r352280)
@@ -58,6 +58,7 @@ void yyerror(const char *);
 int yylex(void);
 %}
 
+%option noyywrap
 %option nounput
 
 /* common section */



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201909130721.x8D7L6DC054878>