d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix build in the !NOATM case by using the begemot library in place of

Browse Source 
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:
Tom Rhodes 2004-09-24 22:10:34 +00:00
parent 7bd076c06c
commit 5f892a7ff0
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=135771
5 changed files with 35 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Makefile
View File

@ -25,7 +25,7 @@
SUBDIR= ${_csu} libcom_err libcrypt libkvm msun libmd libncurses \
libnetgraph libradius librpcsvc libsbuf libtacplus libutil \
${_libypclnt} libalias libarchive ${_libatm} \
${_libbluetooth} libbsnmp libbz2 libc ${_libc_r} \
libbegemot ${_libbluetooth} libbsnmp libbz2 libc ${_libc_r} \
libcalendar libcam libcompat libdevinfo libdevstat ${_libdisk} \
libedit libexpat libfetch libform libftpio libgeom ${_libio} libipsec \
libipx libkiconv libmagic libmenu ${_libmilter} ${_libmp} \

27
lib/libbegemot/Makefile Normal file
View 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>

1
share/mk/bsd.libnames.mk
View File

@ -14,6 +14,7 @@ LIBALIAS?= ${DESTDIR}${LIBDIR}/libalias.a
LIBARCHIVE?= ${DESTDIR}${LIBDIR}/libarchive.a
LIBASN1?= ${DESTDIR}${LIBDIR}/libasn1.a
LIBATM?= ${DESTDIR}${LIBDIR}/libatm.a
LIBBEGEMOT?= ${DESTDIR}${LIBDIR}/libbegemot.a
.if !defined(NO_BIND) && defined(WITH_BIND_LIBS)
LIBBIND?= ${DESTDIR}${LIBDIR}/libbind.a
LIBBIND9?= ${DESTDIR}${LIBDIR}/libbind9.a

6
usr.bin/atm/sscop/Makefile
View File

@ -7,9 +7,9 @@ CONTRIB= ${.CURDIR}/../../../contrib/ngatm/sscop
PROG= sscop
SRCS= common.c sscop_main.c
WARNS?= 6
CFLAGS+= -I${CONTRIB}
CFLAGS+= -I${CONTRIB} -DUSE_LIBBEGEMOT
DPADD= ${LIBISC} ${LIBNETGRAPH} ${LIBNGATM}
LDADD= ${LIBISC} ${LIBNETGRAPH} ${LIBNGATM}
DPADD= ${LIBBEGEMOT} ${LIBNETGRAPH} ${LIBNGATM}
LDADD= -lbegemot -lnetgraph -lngatm
.include <bsd.prog.mk>

6
usr.sbin/bsnmpd/bsnmpd/Makefile
View File

@ -23,9 +23,9 @@ BMIBSDIR= ${SHAREDIR}/snmp/mibs
DEFS= tree.def
DEFSDIR= ${SHAREDIR}/snmp/defs
CFLAGS+= -I${CONTRIB}/lib -I${CONTRIB}/snmpd -I.
DPADD= ${LIBISC} ${LIBBSNMP}
LDADD= -lisc -lbsnmp
CFLAGS+= -I${CONTRIB}/lib -I${CONTRIB}/snmpd -I. -DUSE_LIBBEGEMOT
DPADD= ${LIBBEGEMOT} ${LIBBSNMP}
LDADD= -lbegemot -lbsnmp
LDFLAGS= -export-dynamic