Author: trociny
Date: Sun May 26 18:28:36 2013
New Revision: 251004
URL: http://svnweb.freebsd.org/changeset/base/251004
Log:
r250503
Get rid of libl dependency. We needed it only to provide yywrap. But
yywrap is not necessary when parsing a single hast.conf file.
Suggested by: kib
Reviewed by: pjd
Modified:
stable/9/sbin/hastctl/Makefile
stable/9/sbin/hastd/Makefile
stable/9/sbin/hastd/token.l
Directory Properties:
stable/9/sbin/hastctl/ (props changed)
stable/9/sbin/hastd/ (props changed)
Modified: stable/9/sbin/hastctl/Makefile
==============================================================================
--- stable/9/sbin/hastctl/Makefile Sun May 26 18:26:29 2013
(r251003)
+++ stable/9/sbin/hastctl/Makefile Sun May 26 18:28:36 2013
(r251004)
@@ -31,8 +31,8 @@ CFLAGS+=-DINET6
CFLAGS+=-DYY_NO_UNPUT
CFLAGS+=-DYY_NO_INPUT
-DPADD= ${LIBL} ${LIBUTIL}
-LDADD= -ll -lutil
+DPADD= ${LIBUTIL}
+LDADD= -lutil
.if ${MK_OPENSSL} != "no"
DPADD+= ${LIBCRYPTO}
LDADD+= -lcrypto
Modified: stable/9/sbin/hastd/Makefile
==============================================================================
--- stable/9/sbin/hastd/Makefile Sun May 26 18:26:29 2013
(r251003)
+++ stable/9/sbin/hastd/Makefile Sun May 26 18:28:36 2013
(r251004)
@@ -30,7 +30,7 @@ CFLAGS+=-DINET6
.endif
DPADD= ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF} ${LIBL} ${LIBPTHREAD} ${LIBUTIL}
-LDADD= -lgeom -lbsdxml -lsbuf -ll -lpthread -lutil
+LDADD= -lgeom -lbsdxml -lsbuf -lpthread -lutil
.if ${MK_OPENSSL} != "no"
DPADD+= ${LIBCRYPTO}
LDADD+= -lcrypto
Modified: stable/9/sbin/hastd/token.l
==============================================================================
--- stable/9/sbin/hastd/token.l Sun May 26 18:26:29 2013 (r251003)
+++ stable/9/sbin/hastd/token.l Sun May 26 18:28:36 2013 (r251004)
@@ -46,6 +46,7 @@ int lineno;
%option noinput
%option nounput
+%option noyywrap
%%
control { DP; return CONTROL; }
_______________________________________________
svn-src-stable-9@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "svn-src-stable-9-unsubscr...@freebsd.org"
