From 389acf125bfcbcd1f7d58b0d9f9c0ba33090e57d Mon Sep 17 00:00:00 2001 From: dougb Date: Fri, 24 Sep 2004 18:42:05 +0000 Subject: Fix the WANT_BIND_LIBS knob by correctly spelling it as WITH_BIND_LIBS 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. --- share/examples/etc/make.conf | 5 +++-- share/man/man5/make.conf.5 | 7 ++++++- share/mk/bsd.libnames.mk | 6 +++--- 3 files changed, 12 insertions(+), 6 deletions(-) (limited to 'share') diff --git a/share/examples/etc/make.conf b/share/examples/etc/make.conf index d74f02f..ab2e837 100644 --- a/share/examples/etc/make.conf +++ b/share/examples/etc/make.conf @@ -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 diff --git a/share/man/man5/make.conf.5 b/share/man/man5/make.conf.5 index 71a0eae..477240d 100644 --- a/share/man/man5/make.conf.5 +++ b/share/man/man5/make.conf.5 @@ -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 diff --git a/share/mk/bsd.libnames.mk b/share/mk/bsd.libnames.mk index e627968..b325960 100644 --- a/share/mk/bsd.libnames.mk +++ b/share/mk/bsd.libnames.mk @@ -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 -- cgit v1.1