svn commit: r352066 - head/usr.bin/m4

[Baptiste Daroussin]

Author: bapt
Date: Mon Sep  9 15:20:19 2019
New Revision: 352066
URL: https://svnweb.freebsd.org/changeset/base/352066

Log:
  Import from OpenBSD a patch which eliminates the link with -ly or -ly
  
  patch by ibara@
  
  Obtained from:	OpenBSD

Modified:
  head/usr.bin/m4/Makefile
  head/usr.bin/m4/tokenizer.l

Modified: head/usr.bin/m4/Makefile
==============================================================================
--- head/usr.bin/m4/Makefile	Mon Sep  9 15:18:04 2019	(r352065)
+++ head/usr.bin/m4/Makefile	Mon Sep  9 15:20:19 2019	(r352066)
@@ -8,7 +8,7 @@
 
 PROG=	m4
 CFLAGS+=-DEXTENDED -I${.CURDIR} -I${SRCTOP}/lib/libopenbsd
-LIBADD=	y l m openbsd
+LIBADD=	m openbsd
 
 NO_WMISSING_VARIABLE_DECLARATIONS=
 

Modified: head/usr.bin/m4/tokenizer.l
==============================================================================
--- head/usr.bin/m4/tokenizer.l	Mon Sep  9 15:18:04 2019	(r352065)
+++ head/usr.bin/m4/tokenizer.l	Mon Sep  9 15:20:19 2019	(r352066)
@@ -43,6 +43,8 @@ oct	0[0-7]*
 dec	[1-9][0-9]*
 radix	0[rR][0-9]+:[0-9a-zA-Z]+
 
+%option noyywrap
+
 %%
 {ws}			{/* just skip it */}
 {hex}|{oct}|{dec}	{ yylval = number(); return(NUMBER); }