rec: meson: add libcap feature and sync build-and-test-all options with autotools...

diff --git a/pdns/dnsdistdist/meson/libcap/meson.build b/meson/libcap/meson.build
similarity index 100%
rename from pdns/dnsdistdist/meson/libcap/meson.build
rename to meson/libcap/meson.build

diff --git a/pdns/dnsdistdist/meson/libcap b/pdns/dnsdistdist/meson/libcap
new file mode 120000 (symlink)
index 0000000..b11256f
--- /dev/null
+++ b/pdns/dnsdistdist/meson/libcap
@@ -0,0 +1 @@
+../../../meson/libcap
\ No newline at end of file

diff --git a/pdns/recursordist/meson.build b/pdns/recursordist/meson.build
index 5d8a970d7b96f784fc93a5828cf3e277b7750f2d..552b1e9cc1b6fd9d6323df59990e99b4b963a7b2 100644 (file)
--- a/pdns/recursordist/meson.build
+++ b/pdns/recursordist/meson.build
@@ -73,6 +73,7 @@ subdir('meson' / 'various-headers')         # Various Headers
 subdir('meson' / 'libresolv')               # res_query
 subdir('meson' / 'dnstap')                  # DNSTAP through libfstream
 subdir('meson' / 'libcurl')                 # Curl
+subdir('meson' / 'libcap')                  # Capabilities
 
 subdir('rec-rust-lib')
 
@@ -318,6 +319,7 @@ deps = [
   dep_dnstap,
   dep_libcurl,
   dep_metrics,
+  dep_libcap,
 ]
 
 # Conditional sources that need to be separated into standalone libraries for special

diff --git a/pdns/recursordist/meson_options.txt b/pdns/recursordist/meson_options.txt
index 64612d31c437ade1aa873a75ae996c77aa367a2c..5636c72b5ba1f3da6bcd2678c99aa5847ca11b39 100644 (file)
--- a/pdns/recursordist/meson_options.txt
+++ b/pdns/recursordist/meson_options.txt
@@ -23,3 +23,4 @@ option('snmp', type: 'boolean', value: false, description: 'Enable SNMP')
 option('dnstap', type: 'feature', value: 'auto', description: 'Enable DNSTAP support through libfstrm')
 option('libcurl', type: 'feature', value: 'auto', description: 'Enable Curl support')
 option('nod', type: 'boolean', value: true, description: 'Enable Newly Obserbed Domains')
+option('libcap', type: 'feature', value: 'auto', description: 'Enable libcap for capabilities handling')

diff --git a/tasks.py b/tasks.py
index c1070e83ebabe2a4cd7553212bedebe1c7990131..158b0996e294b9c244ff12335da53751bab76e90 100644 (file)
--- a/tasks.py
+++ b/tasks.py
@@ -581,32 +581,33 @@ def ci_auth_configure(c, build_dir=None, meson=False):
                 ci_auth_configure_autotools(c)
 
 def ci_rec_configure_meson(c, features, build_dir):
-    # XXX features
     unittests = get_unit_tests(meson=True, auth=False)
     if features == "full":
         configure_cmd = " ".join([
             "LDFLAGS='-L/usr/local/lib -Wl,-rpath,/usr/local/lib'",
             get_base_configure_cmd_meson(build_dir),
+            "-D prefix=/opt/pdns-recursor",
             "-D dns-over-tls=true",
             "-D nod=true",
-            "-D snmp=true",
+            "-D libcap=enabled",
             "-D lua=luajit",
-            "-D prefix=/opt/pdns-recursor",
+            "-D snmp=true",
             unittests,
         ])
     else:
         configure_cmd = " ".join([
             "LDFLAGS='-L/usr/local/lib -Wl,-rpath,/usr/local/lib'",
             get_base_configure_cmd_meson(build_dir),
+            "-D prefix=/opt/pdns-recursor",
             "-D dns-over-tls=false",
             "-D dnstap=disabled",
-            "-D libcurl=disabled",
-            "-D lua=luajit",
             "-D nod=false",
-            "-D prefix=/opt/pdns-recursor",
+            "-D systemd=disabled",
+            "-D lua=luajit",
+            "-D libcap=disabled",
+            "-D libcurl=disabled",
             "-D signers-libsodium=disabled",
             "-D snmp=false",
-            "-D systemd=disabled",
             unittests,
         ])
     res = c.run(configure_cmd, warn=True)