diff options
| author |   Jussi Kukkonen <jussi.kukkonen@intel.com> | 2017-03-16 16:30:23 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-03-17 11:55:25 +0000 |
| commit | b00f9c77ebd211578ba133c28abcbc5752305e25 (patch) | |
| tree | f17c4a5a44d6f75752d39fe9cdcbaf91ae150f6c /meta | |
| parent | d08cfe3d3de01c529dda1a60f42870dd3132c256 (diff) | |
| download | openembedded-core-contrib-b00f9c77ebd211578ba133c28abcbc5752305e25.tar.gz | |
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.
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
3 files changed, 34 insertions, 1 deletions
diff --git a/meta/conf/distro/include/security_flags.inc b/meta/conf/distro/include/security_flags.inc index b0a775450f..da1c3a01db 100644 --- a/meta/conf/distro/include/security_flags.inc +++ b/meta/conf/distro/include/security_flags.inc @@ -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 = "" diff --git a/meta/recipes-devtools/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc index 131ff70e58..6c8b36d18d 100644 --- a/meta/recipes-devtools/cmake/cmake.inc +++ b/meta/recipes-devtools/cmake/cmake.inc @@ -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" diff --git a/meta/recipes-devtools/cmake/cmake/0001-KWIML-tests-Remove-format-security-from-flags.patch b/meta/recipes-devtools/cmake/cmake/0001-KWIML-tests-Remove-format-security-from-flags.patch new file mode 100644 index 0000000000..190133ba5c --- /dev/null +++ b/meta/recipes-devtools/cmake/cmake/0001-KWIML-tests-Remove-format-security-from-flags.patch @@ -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 + |