svn commit: r352124 - in head/usr.sbin: ctld ndiscvt

[Baptiste Daroussin]

Author: bapt
Date: Tue Sep 10 07:28:27 2019
New Revision: 352124
URL: https://svnweb.freebsd.org/changeset/base/352124

Log:
  Stop linking to libl by specifying we do not need yywrap
  
  MFC after: 3 days

Modified:
  head/usr.sbin/ctld/Makefile
  head/usr.sbin/ctld/token.l
  head/usr.sbin/ndiscvt/Makefile
  head/usr.sbin/ndiscvt/inf-token.l

Modified: head/usr.sbin/ctld/Makefile
==============================================================================
--- head/usr.sbin/ctld/Makefile	Tue Sep 10 07:26:38 2019	(r352123)
+++ head/usr.sbin/ctld/Makefile	Tue Sep 10 07:28:27 2019	(r352124)
@@ -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: head/usr.sbin/ctld/token.l
==============================================================================
--- head/usr.sbin/ctld/token.l	Tue Sep 10 07:26:38 2019	(r352123)
+++ head/usr.sbin/ctld/token.l	Tue Sep 10 07:28:27 2019	(r352124)
@@ -45,6 +45,7 @@ extern int	yylex(void);
 
 %}
 
+%option noyywrap
 %option noinput
 %option nounput
 

Modified: head/usr.sbin/ndiscvt/Makefile
==============================================================================
--- head/usr.sbin/ndiscvt/Makefile	Tue Sep 10 07:26:38 2019	(r352123)
+++ head/usr.sbin/ndiscvt/Makefile	Tue Sep 10 07:28:27 2019	(r352124)
@@ -13,8 +13,6 @@ MAN+=	ndisgen.8
 WARNS?=	4
 NO_WCAST_ALIGN=
 
-LIBADD=	l
-
 YFLAGS+=-v
 
 CFLAGS+=-I. -I${.CURDIR} -I${SRCTOP}/sys

Modified: head/usr.sbin/ndiscvt/inf-token.l
==============================================================================
--- head/usr.sbin/ndiscvt/inf-token.l	Tue Sep 10 07:26:38 2019	(r352123)
+++ head/usr.sbin/ndiscvt/inf-token.l	Tue Sep 10 07:28:27 2019	(r352124)
@@ -59,6 +59,7 @@ update_lineno(const char *cp)
 
 %}
 
+%option noyywrap
 %option nounput
 %option noinput