From ad746bd1b792ecce5fe7ee35445473abca04c9da Mon Sep 17 00:00:00 2001 From: Ed Maste Date: Fri, 10 Apr 2015 21:24:38 +0000 Subject: [PATCH] Fix libfifolog dependency on libz Consumers should not need to encode fifolog's dependency on libz. Handle it automatically in src.libnames.mk. Differential Revision: https://reviews.freebsd.org/D2278 Reviewed by: bapt Sponsored by: The FreeBSD Foundation --- share/mk/src.libnames.mk | 3 +++ usr.sbin/fifolog/fifolog_reader/Makefile | 2 +- usr.sbin/fifolog/fifolog_writer/Makefile | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/share/mk/src.libnames.mk b/share/mk/src.libnames.mk index 0fbad38e8790..044fc04e33b4 100644 --- a/share/mk/src.libnames.mk +++ b/share/mk/src.libnames.mk @@ -259,6 +259,9 @@ LDADD_sqlite3+= ${LDADD_pthread} DPADD_atf_cxx+= ${DPADD_atf_c} LDADD_atf_cxx+= ${LDADD_atf_c} +DPADD_fifolog+= ${DPADD_z} +LDADD_fifolog+= ${LDADD_z} + DPADD_ipf+= ${DPADD_kvm} LDADD_ipf+= ${LDADD_kvm} diff --git a/usr.sbin/fifolog/fifolog_reader/Makefile b/usr.sbin/fifolog/fifolog_reader/Makefile index 19ce28144e07..ae5f9e7ba403 100644 --- a/usr.sbin/fifolog/fifolog_reader/Makefile +++ b/usr.sbin/fifolog/fifolog_reader/Makefile @@ -6,7 +6,7 @@ CFLAGS+= -I${.CURDIR}/../lib MAN= -LIBADD= z fifolog +LIBADD= fifolog regress: ./${PROG} /tmp/fifolog.0 diff --git a/usr.sbin/fifolog/fifolog_writer/Makefile b/usr.sbin/fifolog/fifolog_writer/Makefile index 3e5e6cc83224..7a9316d3f654 100644 --- a/usr.sbin/fifolog/fifolog_writer/Makefile +++ b/usr.sbin/fifolog/fifolog_writer/Makefile @@ -6,7 +6,7 @@ CFLAGS+= -I${.CURDIR}/../lib MAN= -LIBADD= z fifolog +LIBADD= fifolog regress: date | ./${PROG} -z 0 /tmp/fifolog.0