Remove fortify Meson option.

Mon, 07 Oct 2019 21:57:38 -0400

author
Elliott Sales de Andrade <qulogic@pidgin.im>
date
Mon, 07 Oct 2019 21:57:38 -0400
changeset 39950
139863d2434b
parent 39949
e04b5ac32433
child 39951
e9eaaff671c9

Remove fortify Meson option.

It's not implemented, and distributors can just enable this themselves
when they know it's available and want it using their normal CFLAGS/etc.
methods.

meson.build file | annotate | diff | comparison | revisions
meson_options.txt file | annotate | diff | comparison | revisions
--- a/meson.build	Mon Oct 07 21:49:08 2019 -0400
+++ b/meson.build	Mon Oct 07 21:57:38 2019 -0400
@@ -620,26 +620,6 @@
 			add_project_arguments(newflag, language : 'c')
 		endif
 	endforeach
-
-	if get_option('fortify')
-#		AC_MSG_CHECKING(for FORTIFY_SOURCE support)
-#		AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <features.h>]], [[
-#			#if !(__GNUC_PREREQ (4, 1) \
-#				|| (defined __GNUC_RH_RELEASE__ && __GNUC_PREREQ (4, 0)) \
-#				|| (defined __GNUC_RH_RELEASE__ && __GNUC_PREREQ (3, 4) \
-#					&& __GNUC_MINOR__ == 4 \
-#					&& (__GNUC_PATCHLEVEL__ > 2 \
-#						|| (__GNUC_PATCHLEVEL__ == 2 && __GNUC_RH_RELEASE__ >= 8))))
-#			#error No FORTIFY_SOURCE support
-#			#endif
-#				return 0;
-#		]])], [
-#			AC_MSG_RESULT(yes)
-#			DEBUG_CFLAGS='$DEBUG_CFLAGS -Wp,-D_FORTIFY_SOURCE=2'
-#		], [
-#			AC_MSG_RESULT(no)
-#		])
-	endif
 endif
 if get_option('buildtype') != 'plain' and SUNCC
 	add_project_arguments('-features=extensions', language : 'c')
--- a/meson_options.txt	Mon Oct 07 21:49:08 2019 -0400
+++ b/meson_options.txt	Mon Oct 07 21:57:38 2019 -0400
@@ -7,9 +7,6 @@
 option('doc', type : 'boolean', value : false,
        description : 'build documentation with gtk-doc')
 
-option('fortify', type : 'boolean', value : true,
-       description : 'compile with FORTIFY_SOURCE support')
-
 option('glib-errors-trace', type : 'boolean', value : false,
        description : 'print backtraces for glib errors')
 

mercurial