From e7b44ef4c80907346ec7492a09c45277459924fc Mon Sep 17 00:00:00 2001
From: Michael Biebl <biebl@debian.org>
Date: Wed, 19 Aug 2020 10:13:49 +0200
Subject: New upstream version 1.26.2

---
 m4/compiler_options.m4 | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'm4')

diff --git a/m4/compiler_options.m4 b/m4/compiler_options.m4
index 9adc1f14..d390a90c 100644
--- a/m4/compiler_options.m4
+++ b/m4/compiler_options.m4
@@ -60,11 +60,20 @@ if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
 
 	CFLAGS_MORE_WARNINGS="-Wall"
 
+	if test "x$enable_lto" = xyes; then
+		dnl With LTO and optimizations enabled, gcc 10.2.1-1.fc32 is really
+		dnl adamant to warn about correct uses of strncpy. Disable that warning.
+		_CFLAGS_MORE_WARNINGS_DISABLE_LTO="-Wno-stringop-overflow"
+	else
+		_CFLAGS_MORE_WARNINGS_DISABLE_LTO=
+	fi
+
 	if test "x$set_more_warnings" = xerror; then
 		CFLAGS_MORE_WARNINGS="$CFLAGS_MORE_WARNINGS -Werror"
 	fi
 
 	for option in \
+		      $_CFLAGS_MORE_WARNINGS_DISABLE_LTO \
 		      -Wextra \
 		      -Wdeclaration-after-statement \
 		      -Wfloat-equal \
-- 
cgit 1.3.0-6-gf8a5