svn commit: r359590 - stable/12/sbin/setkey

[Baptiste Daroussin]

Author: bapt
Date: Fri Apr  3 05:11:16 2020
New Revision: 359590
URL: https://svnweb.freebsd.org/changeset/base/359590

Log:
  MFC r359239, r359241 setkey
  
  r359239:
  Revove useless linking to yacc
  
  r359241:
  Remove the link to libl which only contains a stub function
  on yywrap, if the flex is told yywrap is not in use, then this linkage becomes
  unnecessary

Modified:
  stable/12/sbin/setkey/Makefile
  stable/12/sbin/setkey/token.l
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sbin/setkey/Makefile
==============================================================================
--- stable/12/sbin/setkey/Makefile	Fri Apr  3 05:08:06 2020	(r359589)
+++ stable/12/sbin/setkey/Makefile	Fri Apr  3 05:11:16 2020	(r359590)
@@ -38,8 +38,6 @@ WARNS?=	1
 CFLAGS+= -I${.CURDIR} -I${SRCTOP}/lib/libipsec
 YFLAGS=	-d
 
-LIBADD=	l y
-
 CLEANFILES=	y.tab.c y.tab.h key_test.o keytest
 
 # libpfkey

Modified: stable/12/sbin/setkey/token.l
==============================================================================
--- stable/12/sbin/setkey/token.l	Fri Apr  3 05:08:06 2020	(r359589)
+++ stable/12/sbin/setkey/token.l	Fri Apr  3 05:11:16 2020	(r359590)
@@ -67,6 +67,8 @@ int parse(FILE **);
 int yyparse(void);
 %}
 
+%option noyywrap
+
 /* common section */
 nl		\n
 ws		[ \t]+