From: Fred Morcos Date: Fri, 13 Oct 2023 06:21:57 +0000 (+0200) Subject: Meson: Rename fortify-source to hardening-fortify-source X-Git-Tag: rec-5.1.0-alpha1~80^2~96 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=735d22e285c07cca2086cc60c89c2bbf9c941c53;p=thirdparty%2Fpdns.git Meson: Rename fortify-source to hardening-fortify-source --- diff --git a/meson/hardening/fortify-source/meson.build b/meson/hardening/fortify-source/meson.build index 259d91ab7c..ddeff4ac4e 100644 --- a/meson/hardening/fortify-source/meson.build +++ b/meson/hardening/fortify-source/meson.build @@ -1,4 +1,4 @@ -fortify_source_opt = get_option('fortify-source') +fortify_source_opt = get_option('hardening-fortify-source') fortify_source = fortify_source_opt != 'disabled' fortify_source_level = 0 diff --git a/meson_options.txt b/meson_options.txt index 02cc9778da..09003a3381 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,7 +1,7 @@ option('lua', type: 'combo', choices: ['auto', 'luajit', 'lua'], value: 'auto', description: 'Lua implementation to use') option('hardening', type: 'feature', value: 'auto', description: 'Compiler security checks') option('hardening-full', type: 'feature', value: 'auto', description: 'Compiler security checks with a performance penalty') -option('fortify-source', type: 'combo', choices: ['auto', 'disabled', '1', '2', '3'], value: '2', description: 'Source fortification level') +option('hardening-fortify-source', type: 'combo', choices: ['auto', 'disabled', '1', '2', '3'], value: '2', description: 'Source fortification level') option('rng-kiss', type: 'boolean', value: false, description: 'Use the unsafe KISS RNG') option('signers-libsodium', type: 'feature', value: 'auto', description: 'Enable libsodium-based signers') option('signers-libdecaf', type: 'feature', value: 'auto', description: 'Enable libdecaf-based signers')