Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/net/bind914 net/bind914: Fix build under NetBSD-current



details:   https://anonhg.NetBSD.org/pkgsrc/rev/c03013cd88b3
branches:  trunk
changeset: 435107:c03013cd88b3
user:      tron <tron%pkgsrc.org@localhost>
date:      Tue Jun 30 17:27:06 2020 +0000

description:
net/bind914: Fix build under NetBSD-current

This package automatically enabled the "blacklist" option under recent
enough versions of NetBSD. However in NetBSD-current the "blacklist"
library has been replaced by the "blocklist" library which BIND currently
doesn't support. And as result the build failed with the default option
because the "blacklist" could not be found.

Change the option check to only enable this option under NetBSD if the
"blacklist" header file can be found. This fixes the build under
NetBSD-current with the default options.

The correct long term fixed would be:
* Wait for a BIND version which supports "blocklist" instead of "blacklist"
* Add "blocklist" as a package in "pkgsrc" with an appropriate "builtin.mk"

diffstat:

 net/bind914/options.mk |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (18 lines):

diff -r 1793c2b5a4ae -r c03013cd88b3 net/bind914/options.mk
--- a/net/bind914/options.mk    Tue Jun 30 17:24:56 2020 +0000
+++ b/net/bind914/options.mk    Tue Jun 30 17:27:06 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2020/05/10 14:25:42 rillig Exp $
+# $NetBSD: options.mk,v 1.5 2020/06/30 17:27:06 tron Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.bind914
 PKG_SUPPORTED_OPTIONS= bind-dig-sigchase bind-xml-statistics-server
@@ -23,7 +23,7 @@
 .endif
 
 .if ${OPSYS} == "NetBSD"
-.  if !empty(OS_VERSION:M[8-9].*)
+.  if exists(/usr/include/blacklist.h)
 PKG_SUGGESTED_OPTIONS+=        blacklist
 .  endif
 .endif



Home | Main Index | Thread Index | Old Index