From: Michal Nowak <mnowak@isc.org>
Date: Wed, 22 Oct 2025 14:13:27 +0000 (+0200)
Subject: Make libcap mandatory on Linux again
X-Git-Tag: v9.21.15~41^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=590c3c28e613fef7b014ffce4876ec9065dea52d;p=thirdparty%2Fbind9.git

Make libcap mandatory on Linux again

When refactoring the BIND 9.21 build system to meson, libcap was
unintentionally made optional on Linux.
---

diff --git a/meson.build b/meson.build
index 619d1347b6d..f99d65f2c68 100644
--- a/meson.build
+++ b/meson.build
@@ -50,7 +50,6 @@ meson_lto = get_option('b_lto')
 trace_logging = get_option('trace-logging')
 rcu_flavor = get_option('rcu-flavor')
 
-cap_opt = get_option('cap')
 cmocka_opt = get_option('cmocka')
 dnstap_opt = get_option('dnstap')
 doc_opt = get_option('doc')
@@ -818,11 +817,9 @@ endif
 
 ## libcap
 cap_dep = null_dep
-if cap_opt.allowed()
-    cap_dep = dependency('libcap', required: cap_opt)
-    if cap_dep.found()
-        config.set('HAVE_LIBCAP', 1)
-    endif
+cap_dep = dependency('libcap', required: host_machine.system() == 'linux')
+if cap_dep.found()
+    config.set('HAVE_LIBCAP', 1)
 endif
 
 ## IDN
diff --git a/meson_options.txt b/meson_options.txt
index 2f1ae16a1ca..70a77f31286 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -17,13 +17,6 @@ option(
     description: 'Enable sphinx-based documentation generation',
 )
 
-option(
-    'cap',
-    type: 'feature',
-    value: 'auto',
-    description: 'Enable libcap-based capability support',
-)
-
 option(
     'dnstap',
     type: 'feature',