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 259d91ab7c8c08936c934125769a88822b1d4805..ddeff4ac4e0ef757c96bbd70d016f7e8753401ef 100644 (file)
--- 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 02cc9778da22f7aa80e0dd10cfc7d593099a931a..09003a33811c5cff7f1f65984b145f8cb6bd06de 100644 (file)
--- 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')