Fix build in the !NOATM case by using the begemot library in place of
using libisc which was a part of BIND8. Discussed with: des, re, dougb Submitted by: harti (one part) Reviewed by: harti (previous version)
This commit is contained in:
parent
7bd076c06c
commit
5f892a7ff0
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=135771
@ -25,7 +25,7 @@
|
|||||||
SUBDIR= ${_csu} libcom_err libcrypt libkvm msun libmd libncurses \
|
SUBDIR= ${_csu} libcom_err libcrypt libkvm msun libmd libncurses \
|
||||||
libnetgraph libradius librpcsvc libsbuf libtacplus libutil \
|
libnetgraph libradius librpcsvc libsbuf libtacplus libutil \
|
||||||
${_libypclnt} libalias libarchive ${_libatm} \
|
${_libypclnt} libalias libarchive ${_libatm} \
|
||||||
${_libbluetooth} libbsnmp libbz2 libc ${_libc_r} \
|
libbegemot ${_libbluetooth} libbsnmp libbz2 libc ${_libc_r} \
|
||||||
libcalendar libcam libcompat libdevinfo libdevstat ${_libdisk} \
|
libcalendar libcam libcompat libdevinfo libdevstat ${_libdisk} \
|
||||||
libedit libexpat libfetch libform libftpio libgeom ${_libio} libipsec \
|
libedit libexpat libfetch libform libftpio libgeom ${_libio} libipsec \
|
||||||
libipx libkiconv libmagic libmenu ${_libmilter} ${_libmp} \
|
libipx libkiconv libmagic libmenu ${_libmilter} ${_libmp} \
|
||||||
|
27
lib/libbegemot/Makefile
Normal file
27
lib/libbegemot/Makefile
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
# $FreeBSD$
|
||||||
|
|
||||||
|
LIBBEGEMOT_DIR=${.CURDIR}/../../contrib/libbegemot
|
||||||
|
|
||||||
|
.PATH: ${LIBBEGEMOT_DIR}
|
||||||
|
|
||||||
|
LIB= begemot
|
||||||
|
SHLIB_MAJOR= 1
|
||||||
|
SHLIBDIR?= /lib
|
||||||
|
|
||||||
|
# WARNS?= 6
|
||||||
|
|
||||||
|
CFLAGS+= -DUSE_SELECT -DQUADFMT='"ll"'
|
||||||
|
SRCS= rpoll.c
|
||||||
|
INCS= rpoll.h
|
||||||
|
MAN= rpoll.3
|
||||||
|
|
||||||
|
rpoll.3: rpoll.man
|
||||||
|
cat ${.ALLSRC} > ${.TARGET}
|
||||||
|
|
||||||
|
MLINKS= rpoll.3 poll_register.3 \
|
||||||
|
rpoll.3 poll_unregister.3 \
|
||||||
|
rpoll.3 poll_start_timer.3 \
|
||||||
|
rpoll.3 poll_stop_timer.3 \
|
||||||
|
rpoll.3 poll_dispatch.3
|
||||||
|
|
||||||
|
.include <bsd.lib.mk>
|
@ -14,6 +14,7 @@ LIBALIAS?= ${DESTDIR}${LIBDIR}/libalias.a
|
|||||||
LIBARCHIVE?= ${DESTDIR}${LIBDIR}/libarchive.a
|
LIBARCHIVE?= ${DESTDIR}${LIBDIR}/libarchive.a
|
||||||
LIBASN1?= ${DESTDIR}${LIBDIR}/libasn1.a
|
LIBASN1?= ${DESTDIR}${LIBDIR}/libasn1.a
|
||||||
LIBATM?= ${DESTDIR}${LIBDIR}/libatm.a
|
LIBATM?= ${DESTDIR}${LIBDIR}/libatm.a
|
||||||
|
LIBBEGEMOT?= ${DESTDIR}${LIBDIR}/libbegemot.a
|
||||||
.if !defined(NO_BIND) && defined(WITH_BIND_LIBS)
|
.if !defined(NO_BIND) && defined(WITH_BIND_LIBS)
|
||||||
LIBBIND?= ${DESTDIR}${LIBDIR}/libbind.a
|
LIBBIND?= ${DESTDIR}${LIBDIR}/libbind.a
|
||||||
LIBBIND9?= ${DESTDIR}${LIBDIR}/libbind9.a
|
LIBBIND9?= ${DESTDIR}${LIBDIR}/libbind9.a
|
||||||
|
@ -7,9 +7,9 @@ CONTRIB= ${.CURDIR}/../../../contrib/ngatm/sscop
|
|||||||
PROG= sscop
|
PROG= sscop
|
||||||
SRCS= common.c sscop_main.c
|
SRCS= common.c sscop_main.c
|
||||||
WARNS?= 6
|
WARNS?= 6
|
||||||
CFLAGS+= -I${CONTRIB}
|
CFLAGS+= -I${CONTRIB} -DUSE_LIBBEGEMOT
|
||||||
|
|
||||||
DPADD= ${LIBISC} ${LIBNETGRAPH} ${LIBNGATM}
|
DPADD= ${LIBBEGEMOT} ${LIBNETGRAPH} ${LIBNGATM}
|
||||||
LDADD= ${LIBISC} ${LIBNETGRAPH} ${LIBNGATM}
|
LDADD= -lbegemot -lnetgraph -lngatm
|
||||||
|
|
||||||
.include <bsd.prog.mk>
|
.include <bsd.prog.mk>
|
||||||
|
@ -23,9 +23,9 @@ BMIBSDIR= ${SHAREDIR}/snmp/mibs
|
|||||||
DEFS= tree.def
|
DEFS= tree.def
|
||||||
DEFSDIR= ${SHAREDIR}/snmp/defs
|
DEFSDIR= ${SHAREDIR}/snmp/defs
|
||||||
|
|
||||||
CFLAGS+= -I${CONTRIB}/lib -I${CONTRIB}/snmpd -I.
|
CFLAGS+= -I${CONTRIB}/lib -I${CONTRIB}/snmpd -I. -DUSE_LIBBEGEMOT
|
||||||
DPADD= ${LIBISC} ${LIBBSNMP}
|
DPADD= ${LIBBEGEMOT} ${LIBBSNMP}
|
||||||
LDADD= -lisc -lbsnmp
|
LDADD= -lbegemot -lbsnmp
|
||||||
|
|
||||||
LDFLAGS= -export-dynamic
|
LDFLAGS= -export-dynamic
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user