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

Fix the WANT_BIND_LIBS knob by correctly spelling it as WITH_BIND_LIBS

Browse Source 
to match how similar syntax is used in the ports system. Thanks to kris
for pointing out my mistake here.

Install the lwres library unless the user defines NO_BIND, or the new
knob, NO_BIND_LIBS_LWRES. There is at least one potential customer
for this library in the wings. Thanks to nectar for the reminder.
This commit is contained in:
Doug Barton 2004-09-24 18:42:05 +00:00
parent 6ac6319b32
commit a2af6bc259
11 changed files with 30 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/bind/bind/Makefile
View File

@ -65,7 +65,7 @@ SRCS+= herror.c res_comp.c res_data.c \
DPADD= ${PTHREAD_DPADD}
LDADD= ${PTHREAD_LDADD}
#.if defined(WANT_BIND_LIBS)
#.if defined(WITH_BIND_LIBS)
#INCS= ${SRCDIR}/include/isc/assertions.h \
# ${SRCDIR}/include/isc/ctl.h \
# ${SRCDIR}/include/isc/dst.h \

2
lib/bind/bind9/Makefile
View File

@ -17,7 +17,7 @@ CFLAGS+= -I${SRCDIR}/include
DPADD= ${PTHREAD_DPADD}
LDADD= ${PTHREAD_LDADD}
.if defined(WANT_BIND_LIBS)
.if defined(WITH_BIND_LIBS)
INCS= ${SRCDIR}/include/bind9/check.h \
${SRCDIR}/include/bind9/getaddresses.h \
${SRCDIR}/include/bind9/version.h

6
lib/bind/config.mk
View File

@ -15,7 +15,7 @@ CFLAGS+= -DHAVE_CONFIG_H
CFLAGS+= -DLIBINTERFACE=${LIBINTERFACE}
CFLAGS+= -DLIBREVISION=${LIBREVISION}
CFLAGS+= -DLIBAGE=${LIBAGE}
.if defined(WANT_BIND_LIBS)
.if defined(WITH_BIND_LIBS)
SHLIB_MAJOR= ${LIBINTERFACE}
SHLIB_MINOR= ${LIBINTERFACE}
.else
@ -61,7 +61,7 @@ CFLAGS+= -I${LIB_BIND_DIR}
.endif
# Link against BIND libraries
.if !defined(WANT_BIND_LIBS)
.if !defined(WITH_BIND_LIBS)
LIBBIND9= ${LIB_BIND_REL}/bind9/libbind9.a
CFLAGS+= -I${BIND_DIR}/lib/bind9/include
LIBDNS= ${LIB_BIND_REL}/dns/libdns.a
@ -84,7 +84,7 @@ CFLAGS+= -I${BIND_DIR}/lib/lwres/unix/include \
.endif
BIND_DPADD= ${LIBBIND9} ${LIBDNS} ${LIBISCCC} ${LIBISCCFG} \
${LIBISC} ${LIBLWRES}
.if defined(WANT_BIND_LIBS)
.if defined(WITH_BIND_LIBS)
BIND_LDADD= -lbind9 -ldns -lisccc -lisccfg -lisc -llwres
.else
BIND_LDADD= ${BIND_DPADD}

2
lib/bind/dns/Makefile
View File

@ -40,7 +40,7 @@ CFLAGS+= -I${.CURDIR}
DPADD= ${CRYPTO_DPADD} ${PTHREAD_DPADD}
LDADD= ${CRYPTO_LDADD} ${PTHREAD_LDADD}
.if defined(WANT_BIND_LIBS)
.if defined(WITH_BIND_LIBS)
DNSINCS= ${SRCDIR}/include/dns/acl.h \
${SRCDIR}/include/dns/adb.h \
${SRCDIR}/include/dns/bit.h \

2
lib/bind/isc/Makefile
View File

@ -41,7 +41,7 @@ CFLAGS+= -I${SRCDIR}/include -I${.CURDIR}
DPADD= ${PTHREAD_DPADD}
LDADD= ${PTHREAD_LDADD}
.if defined(WANT_BIND_LIBS)
.if defined(WITH_BIND_LIBS)
INCS= ${SRCDIR}/include/isc/app.h \
${SRCDIR}/include/isc/assertions.h \
${SRCDIR}/include/isc/base64.h \

2
lib/bind/isccc/Makefile
View File

@ -19,7 +19,7 @@ CFLAGS+= -I${SRCDIR}/include
DPADD= ${PTHREAD_DPADD}
LDADD= ${PTHREAD_LDADD}
.if defined(WANT_BIND_LIBS)
.if defined(WITH_BIND_LIBS)
INCS= ${SRCDIR}/include/isccc/alist.h \
${SRCDIR}/include/isccc/base64.h \
${SRCDIR}/include/isccc/cc.h \

2
lib/bind/isccfg/Makefile
View File

@ -17,7 +17,7 @@ CFLAGS+= -I${SRCDIR}/include -I${.CURDIR}
DPADD= ${PTHREAD_DPADD}
LDADD= ${PTHREAD_LDADD}
.if defined(WANT_BIND_LIBS)
.if defined(WITH_BIND_LIBS)
INCS= ${SRCDIR}/include/isccfg/cfg.h \
${SRCDIR}/include/isccfg/grammar.h \
${SRCDIR}/include/isccfg/log.h \

10
lib/bind/lwres/Makefile
View File

@ -22,7 +22,14 @@ CFLAGS+= -I${.CURDIR}
DPADD= ${PTHREAD_DPADD}
LDADD= ${PTHREAD_LDADD}
.if defined(WANT_BIND_LIBS)
# Unlike other BIND libs, this should be installed unless the user says NO.
.if !defined(NO_BIND)
.if !defined(NO_BIND_LIBS_LWRES)
.undef INTERNALLIB
SHLIB_MAJOR= ${LIBINTERFACE}
SHLIB_MINOR= ${LIBINTERFACE}
INCS= ${SRCDIR}/include/lwres/context.h \
${SRCDIR}/include/lwres/int.h \
${SRCDIR}/include/lwres/ipv6.h \
@ -39,5 +46,6 @@ INCS= ${SRCDIR}/include/lwres/context.h \
INCSDIR= ${INCLUDEDIR}/lwres
.endif
.endif
.include <bsd.lib.mk>

5
share/examples/etc/make.conf
View File

@ -145,8 +145,9 @@
#
# Variables to control whether parts of the base BIND are built.
# Defining NO_BIND makes all of the following BIND variables obsolete.
#NO_BIND= true # Do not build or install any part of BIND
#WANT_BIND_LIBS=true # Install the BIND libs and include files
#NO_BIND= true # Do not build any part of BIND
#NO_BIND_LIBS_LWRES= true # Do not install the lwres library
#WITH_BIND_LIBS= true # Install the BIND libs and include files
#
# To build sys/modules when building the world (our old way of doing things)
#MODULES_WITH_WORLD=true # do not build modules when building kernel

7
share/man/man5/make.conf.5
View File

@ -603,7 +603,12 @@ subdir.
.Pq Vt bool
Setting this variable will prevent any part of BIND from being built,
regardless of the presence of any of the other *_BIND_* variables below.
.It Va WANT_BIND_LIBS
.It Va NO_BIND_LIBS_LWRES
.Pq Vt bool
Set to avoid installing the lwres library in
.Pa /usr/lib .
The library that is private to the build system may still be built as needed.
.It Va WITH_BIND_LIBS
.Pq Vt bool
Set to install BIND libraries and include files.
.It Va PPP_NOSUID

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

@ -14,7 +14,7 @@ LIBALIAS?= ${DESTDIR}${LIBDIR}/libalias.a
LIBARCHIVE?= ${DESTDIR}${LIBDIR}/libarchive.a
LIBASN1?= ${DESTDIR}${LIBDIR}/libasn1.a
LIBATM?= ${DESTDIR}${LIBDIR}/libatm.a
.if !defined(NO_BIND) && defined(WANT_BIND_LIBS)
.if !defined(NO_BIND) && defined(WITH_BIND_LIBS)
LIBBIND?= ${DESTDIR}${LIBDIR}/libbind.a
LIBBIND9?= ${DESTDIR}${LIBDIR}/libbind9.a
.endif
@ -52,7 +52,7 @@ LIBHDB?= ${DESTDIR}${LIBDIR}/libhdb.a
LIBHISTORY?= ${DESTDIR}${LIBDIR}/libhistory.a
LIBIPSEC?= ${DESTDIR}${LIBDIR}/libipsec.a
LIBIPX?= ${DESTDIR}${LIBDIR}/libipx.a
.if !defined(NO_BIND) && defined(WANT_BIND_LIBS)
.if !defined(NO_BIND) && defined(WITH_BIND_LIBS)
LIBISC?= ${DESTDIR}${LIBDIR}/libisc.a
LIBISCCC?= ${DESTDIR}${LIBDIR}/libisccc.a
LIBISCCFG?= ${DESTDIR}${LIBDIR}/libisccfg.a
@ -66,7 +66,7 @@ LIBKRB5?= ${DESTDIR}${LIBDIR}/libkrb5.a
LIBKVM?= ${DESTDIR}${LIBDIR}/libkvm.a
LIBL?= ${DESTDIR}${LIBDIR}/libl.a
LIBLN?= "don't use LIBLN, use LIBL"
.if !defined(NO_BIND) && defined(WANT_BIND_LIBS)
.if !defined(NO_BIND)
LIBLWRES?= ${DESTDIR}${LIBDIR}/liblwres.a
.endif
LIBM?= ${DESTDIR}${LIBDIR}/libm.a