diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2017-06-02 15:42:43 -0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-06-05 09:19:51 +0100 |
commit | e3372ac0b4b0d1e5d246837aa940f020b6c0cfbc (patch) | |
tree | bea77bc5d99294d2e0b288eff358eeb4d4c60da4 /meta/recipes-devtools/cmake/cmake | |
parent | 374f3d6be2df7393dc6ac5d7ea34f12e2d2c4f03 (diff) | |
download | poky-e3372ac0b4b0d1e5d246837aa940f020b6c0cfbc.tar.gz |
cmake: Upgrade to 3.8.2
There was a set of changes, those are:
- CMake now requires librhash for build and as there is no other
users in OE-Core we make it use its internal copy instead;
- Copyright.txt checksum has change due new contrubutors and 2017
year additions;
- Patch avoid-gcc-warnings-with-Wstrict-prototypes.patch was removed
as it is not need anymore;
- Patch 0001-KWIML-tests-Remove-format-security-from-flags.patch was
removed as it is included in this release.
(From OE-Core rev: cc75f693bde412edd0a1aa4fd4e92fb29b492b76)
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/cmake/cmake')
-rw-r--r-- | meta/recipes-devtools/cmake/cmake/0001-KWIML-tests-Remove-format-security-from-flags.patch | 33 | ||||
-rw-r--r-- | meta/recipes-devtools/cmake/cmake/avoid-gcc-warnings-with-Wstrict-prototypes.patch | 42 |
2 files changed, 0 insertions, 75 deletions
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 deleted file mode 100644 index 190133ba5c..0000000000 --- a/meta/recipes-devtools/cmake/cmake/0001-KWIML-tests-Remove-format-security-from-flags.patch +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | From 0941395b146804abcd87004589ff6e7a2953412d Mon Sep 17 00:00:00 2001 | ||
2 | From: Jussi Kukkonen <jussi.kukkonen@intel.com> | ||
3 | Date: Thu, 16 Mar 2017 14:39:04 +0200 | ||
4 | Subject: [PATCH] KWIML tests: Remove format-security from flags | ||
5 | |||
6 | For the tests where "format" is removed from flags, "format-security" | ||
7 | should be removed as well. Otherwise building cmake with | ||
8 | "-Wformat -Wformat-security" fails: | ||
9 | |||
10 | | cc1: error: -Wformat-security ignored without -Wformat [-Werror=format-security] | ||
11 | |||
12 | Upstream-Status: Backport [part of commit f77420cfc9] | ||
13 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> | ||
14 | --- | ||
15 | Utilities/KWIML/test/CMakeLists.txt | 2 +- | ||
16 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
17 | |||
18 | diff --git a/Utilities/KWIML/test/CMakeLists.txt b/Utilities/KWIML/test/CMakeLists.txt | ||
19 | index 4f6f37b..1bf93bb 100644 | ||
20 | --- a/Utilities/KWIML/test/CMakeLists.txt | ||
21 | +++ b/Utilities/KWIML/test/CMakeLists.txt | ||
22 | @@ -10,7 +10,7 @@ endif() | ||
23 | # Suppress printf/scanf format warnings; we test if the sizes match. | ||
24 | foreach(lang C CXX) | ||
25 | if(KWIML_LANGUAGE_${lang} AND CMAKE_${lang}_COMPILER_ID STREQUAL "GNU") | ||
26 | - set(CMAKE_${lang}_FLAGS "${CMAKE_${lang}_FLAGS} -Wno-format") | ||
27 | + set(CMAKE_${lang}_FLAGS "${CMAKE_${lang}_FLAGS} -Wno-format -Wno-format-security") | ||
28 | endif() | ||
29 | endforeach() | ||
30 | |||
31 | -- | ||
32 | 2.1.4 | ||
33 | |||
diff --git a/meta/recipes-devtools/cmake/cmake/avoid-gcc-warnings-with-Wstrict-prototypes.patch b/meta/recipes-devtools/cmake/cmake/avoid-gcc-warnings-with-Wstrict-prototypes.patch deleted file mode 100644 index 8b8d4802ee..0000000000 --- a/meta/recipes-devtools/cmake/cmake/avoid-gcc-warnings-with-Wstrict-prototypes.patch +++ /dev/null | |||
@@ -1,42 +0,0 @@ | |||
1 | From 4bc17345c01ea467099e28c7df30c23ace9e7811 Mon Sep 17 00:00:00 2001 | ||
2 | From: Andre McCurdy <armccurdy@gmail.com> | ||
3 | Date: Fri, 14 Oct 2016 16:26:58 -0700 | ||
4 | Subject: [PATCH] CheckFunctionExists.c: avoid gcc warnings with | ||
5 | -Wstrict-prototypes | ||
6 | |||
7 | Avoid warnings (and therefore build failures etc) if a user happens | ||
8 | to add -Wstrict-prototypes to CFLAGS. | ||
9 | |||
10 | | $ gcc --version | ||
11 | | gcc (Ubuntu 4.8.4-2ubuntu1~14.04.3) 4.8.4 | ||
12 | | | ||
13 | | $ gcc -Wstrict-prototypes -Werror -DCHECK_FUNCTION_EXISTS=pthread_create -o foo.o -c Modules/CheckFunctionExists.c | ||
14 | | Modules/CheckFunctionExists.c:7:3: error: function declaration isn't a prototype [-Werror=strict-prototypes] | ||
15 | | CHECK_FUNCTION_EXISTS(); | ||
16 | | ^ | ||
17 | | cc1: all warnings being treated as errors | ||
18 | | | ||
19 | |||
20 | Upstream-Status: Pending | ||
21 | |||
22 | Signed-off-by: Andre McCurdy <armccurdy@gmail.com> | ||
23 | --- | ||
24 | Modules/CheckFunctionExists.c | 2 +- | ||
25 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
26 | |||
27 | diff --git a/Modules/CheckFunctionExists.c b/Modules/CheckFunctionExists.c | ||
28 | index 2304000..224e340 100644 | ||
29 | --- a/Modules/CheckFunctionExists.c | ||
30 | +++ b/Modules/CheckFunctionExists.c | ||
31 | @@ -4,7 +4,7 @@ | ||
32 | extern "C" | ||
33 | #endif | ||
34 | char | ||
35 | - CHECK_FUNCTION_EXISTS(); | ||
36 | + CHECK_FUNCTION_EXISTS(void); | ||
37 | #ifdef __CLASSIC_C__ | ||
38 | int main() | ||
39 | { | ||
40 | -- | ||
41 | 1.9.1 | ||
42 | |||