sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

cmake: Backport fix to enable -Wformat-security 

Backport build fix that removes -Wformat-security for specific tests.
Enable "-Wformat-security" for cmake in security_flags.inc.

(From OE-Core rev: b00f9c77ebd211578ba133c28abcbc5752305e25)

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Jussi Kukkonen 2017-03-16 16:30:23 +02:00 committed by Richard Purdie
parent a861ee210c
commit 6dcf5c6e6e
3 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
meta/conf/distro/include/security_flags.inc
View File

@ -91,7 +91,6 @@ SECURITY_CFLAGS_pn-zlib = "${SECURITY_NO_PIE_CFLAGS}"
# Recipes which fail to compile when elevating -Wformat-security to an error
SECURITY_STRINGFORMAT_pn-busybox = ""
SECURITY_STRINGFORMAT_pn-cmake = ""
SECURITY_STRINGFORMAT_pn-expect = ""
SECURITY_STRINGFORMAT_pn-gcc = ""
SECURITY_STRINGFORMAT_pn-kexec-tools = ""

1
meta/recipes-devtools/cmake/cmake.inc
View File

@ -15,6 +15,7 @@ SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \
file://support-oe-qt4-tools-names.patch \
file://qt4-fail-silent.patch \
file://avoid-gcc-warnings-with-Wstrict-prototypes.patch \
file://0001-KWIML-tests-Remove-format-security-from-flags.patch \
"
SRC_URI[md5sum] = "79bd7e65cd81ea3aa2619484ad6ff25a"

33
meta/recipes-devtools/cmake/cmake/0001-KWIML-tests-Remove-format-security-from-flags.patch Normal file
View File

@ -0,0 +1,33 @@
From 0941395b146804abcd87004589ff6e7a2953412d Mon Sep 17 00:00:00 2001
From: Jussi Kukkonen <jussi.kukkonen@intel.com>
Date: Thu, 16 Mar 2017 14:39:04 +0200
Subject: [PATCH] KWIML tests: Remove format-security from flags
For the tests where "format" is removed from flags, "format-security"
should be removed as well. Otherwise building cmake with
"-Wformat -Wformat-security" fails:
| cc1: error: -Wformat-security ignored without -Wformat [-Werror=format-security]
Upstream-Status: Backport [part of commit f77420cfc9]
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
Utilities/KWIML/test/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Utilities/KWIML/test/CMakeLists.txt b/Utilities/KWIML/test/CMakeLists.txt
index 4f6f37b..1bf93bb 100644
--- a/Utilities/KWIML/test/CMakeLists.txt
+++ b/Utilities/KWIML/test/CMakeLists.txt
@@ -10,7 +10,7 @@ endif()
# Suppress printf/scanf format warnings; we test if the sizes match.
foreach(lang C CXX)
if(KWIML_LANGUAGE_${lang} AND CMAKE_${lang}_COMPILER_ID STREQUAL "GNU")
- set(CMAKE_${lang}_FLAGS "${CMAKE_${lang}_FLAGS} -Wno-format")
+ set(CMAKE_${lang}_FLAGS "${CMAKE_${lang}_FLAGS} -Wno-format -Wno-format-security")
endif()
endforeach()
--
2.1.4