Meson: Cleanup reproducible builds module

diff --git a/meson/reproducible/meson.build b/meson/reproducible/meson.build
index 8263d0abccaded338c87f5d584472cb052a817a8..1b53312c74d69eaa75033688957a9cb8c3f59338 100644 (file)
--- a/meson/reproducible/meson.build
+++ b/meson/reproducible/meson.build
@@ -1,10 +1,8 @@
-# Reproducible Builds
-# Inputs: conf
-
 opt_repro = get_option('reproducible')
-conf.set10('REPRODUCIBLE', opt_repro, description: 'Whether we enable reproducible builds')
+conf.set('REPRODUCIBLE', opt_repro, description: 'Reproducible builds')
+summary('Reproducible Builds', opt_repro, bool_yn: true, section: 'Reproducible Builds')
 
-if opt_repro
+if not opt_repro
   id_prog = find_program('id', required: opt_repro)
   id_prog_res = run_command(id_prog, '-u', '-n', check: true)
   build_user = id_prog_res.stdout().strip()
@@ -45,6 +43,6 @@ if opt_repro
   endif
 
   build_host = build_user + '@' + build_host
-  conf.set_quoted('BUILD_HOST', build_host, description: 'The user and host to built PowerDNS')
+  conf.set_quoted('BUILD_HOST', build_host, description: 'User and host who built PowerDNS')
   summary('Build Host', build_host, section: 'Reproducible Builds')
 endif

diff --git a/meson_options.txt b/meson_options.txt
index cf8ca4aa111eb5131df6c9468749b37f4e3769c1..901ab2dce4d325a49f9ae58deec64a939bfaed44 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -12,7 +12,7 @@ option('dns-over-tls', type: 'boolean', value: false, description: 'DNS over TLS
 option('ipcipher', type: 'feature', value: 'auto', description: 'IPcipher (requires libcrypto)')
 option('unit-tests', type: 'boolean', value: false, description: 'Build and run unit tests')
 option('unit-tests-backends', type: 'boolean', value: false, description: 'Build and run backend unit tests')
-option('reproducible', type: 'boolean', value: false, description: 'Create reproducible builds (for distribution maintainers, makes debugging more difficult)')
+option('reproducible', type: 'boolean', value: false, description: 'Reproducible builds (for distro maintainers, makes debugging difficult)')
 option('fuzz-targets', type: 'boolean', value: false, description: 'Enable fuzzing targets')
 option('verbose-logging', type: 'boolean', value: false, description: 'Enable verbose logging')
 option('experimental-pkcs11', type: 'feature', value: 'disabled', description: 'PKCS11 support')