From: Fred Morcos <fred.morcos@open-xchange.com>
Date: Fri, 13 Oct 2023 08:17:05 +0000 (+0200)
Subject: Meson: Move fortify-source out of the normal set of hardening features
X-Git-Tag: rec-5.1.0-alpha1~80^2~94
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5afd5b8e9dbddc4a0e94b953c7c53a472f0cd70e;p=thirdparty%2Fpdns.git

Meson: Move fortify-source out of the normal set of hardening features
---

diff --git a/meson/hardening/fortify-source/meson.build b/meson/hardening/fortify-source/meson.build
index ddeff4ac4e..2ef4ea9c98 100644
--- a/meson/hardening/fortify-source/meson.build
+++ b/meson/hardening/fortify-source/meson.build
@@ -27,8 +27,6 @@ if fortify_source
       endif
     endif
   endforeach
-
-  hardening_features += [[fortify_source_level != 0, 'Source Fortification']]
 endif
 
 fortify_source = fortify_source and fortify_source_level != 0
diff --git a/meson/hardening/meson.build b/meson/hardening/meson.build
index e80ed091c0..18d7161532 100644
--- a/meson/hardening/meson.build
+++ b/meson/hardening/meson.build
@@ -13,7 +13,6 @@ if opt_hardening.enabled() or opt_hardening.auto()
 
   subdir('stack-prot')          # Stack Protector
   subdir('stack-smashing-prot') # Stack-Smashing Protection
-  subdir('fortify-source')      # Fortify Source
   subdir('relro')               # RELRO
 
   foreach feature: hardening_features
@@ -30,3 +29,4 @@ if opt_hardening.enabled() or opt_hardening.auto()
   endforeach
 endif
 
+subdir('fortify-source')      # Fortify Source