From: Fred Morcos <fred.morcos@open-xchange.com>
Date: Tue, 8 Aug 2023 11:28:02 +0000 (+0200)
Subject: Meson: Disable some features for their meson counterpart
X-Git-Tag: rec-5.1.0-alpha1~80^2~294
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6e636103605f0eb5a1c240546003fd30db95fbc0;p=thirdparty%2Fpdns.git

Meson: Disable some features for their meson counterpart
---

diff --git a/meson.build b/meson.build
index 6db64c85f5..3a8209c758 100644
--- a/meson.build
+++ b/meson.build
@@ -66,9 +66,11 @@ subdir('meson/gss-tsig')                 # GSS-TSIG
 subdir('meson/auth-tools')               # Tools
 subdir('meson/ixfrdist')                 # Ixfrdist
 subdir('meson/systemd')                  # Systemd and unit file handling
-subdir('meson/code-coverage')            # Code coverage
+# TODO Use meson's -Db_coverage option?
+# subdir('meson/code-coverage')            # Code coverage
 subdir('meson/auto-var-init')            # Automatic Variable Initialization
-subdir('meson/sanitizers')               # Sanitizers
+# TODO Use meson's -Db_sanitize option?
+# subdir('meson/sanitizers')               # Sanitizers
 
 # Find or generate pdns/dnslabeltext.cc
 if not ragel.found() and not fs.exists('pdns/dnslabeltext.cc')
diff --git a/meson/hardening/meson.build b/meson/hardening/meson.build
index 6020bc1ce4..349df78dd0 100644
--- a/meson/hardening/meson.build
+++ b/meson/hardening/meson.build
@@ -4,7 +4,8 @@ opt_hardening = get_option('hardening')
 if opt_hardening.enabled() or opt_hardening.auto()
   hardening_features = []
 
-  subdir('pie')                 # PIE
+  # TODO Use meson's -Db_pie and -Db_staticpic options?
+  # subdir('pie')                 # PIE
   subdir('stack-prot')          # Stack Protector
   subdir('stack-smashing-prot') # Stack-Smashing Protection
   subdir('fortify-source')      # Fortify Source
diff --git a/meson_options.txt b/meson_options.txt
index cdb64da884..75c71e43b0 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -46,10 +46,12 @@ option('tools-ixfrdist', type: 'boolean', value: false, description: 'Build ixfr
 option('lua-records', type: 'boolean', value: true, description: 'Support Lua records')
 option('systemd-service-user', type: 'string', value: 'pdns', description: 'Systemd service user (setuid and unit file; user is not created)')
 option('systemd-service-group', type: 'string', value: 'pdns', description: 'Systemd service group (setgid and unit file; group is not created)')
-option('code-coverage', type: 'boolean', value: false, description: 'Enable code coverage')
+# TODO Use meson's -Db_coverage option?
+# option('code-coverage', type: 'boolean', value: false, description: 'Enable code coverage')
 option('auto-var-init', type: 'combo', value: 'disabled', choices: ['zero', 'pattern', 'disabled'], description: 'Enable initialization of automatic variables')
-option('sanitizer-address', type: 'boolean', value: false, description: 'Enable the Address Sanitizer')
-option('sanitizer-memory', type: 'boolean', value: false, description: 'Enable the Memory Sanitizer')
-option('sanitizer-thread', type: 'boolean', value: false, description: 'Enable the Thread Sanitizer')
-option('sanitizer-leak', type: 'boolean', value: false, description: 'Enable the Leak Sanitizer')
-option('sanitizer-undefined', type: 'boolean', value: false, description: 'Enable the Undefined Behavior Sanitizer')
+# TODO Use meson's -Db_sanitize option?
+# option('sanitizer-address', type: 'boolean', value: false, description: 'Enable the Address Sanitizer')
+# option('sanitizer-memory', type: 'boolean', value: false, description: 'Enable the Memory Sanitizer')
+# option('sanitizer-thread', type: 'boolean', value: false, description: 'Enable the Thread Sanitizer')
+# option('sanitizer-leak', type: 'boolean', value: false, description: 'Enable the Leak Sanitizer')
+# option('sanitizer-undefined', type: 'boolean', value: false, description: 'Enable the Undefined Behavior Sanitizer')