summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2017-06-02 15:42:43 -0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-06-05 09:19:51 +0100
commite3372ac0b4b0d1e5d246837aa940f020b6c0cfbc (patch)
treebea77bc5d99294d2e0b288eff358eeb4d4c60da4 /meta/recipes-devtools
parent374f3d6be2df7393dc6ac5d7ea34f12e2d2c4f03 (diff)
downloadpoky-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')
-rw-r--r--meta/recipes-devtools/cmake/cmake-native_3.8.2.bb (renamed from meta/recipes-devtools/cmake/cmake-native_3.7.2.bb)1
-rw-r--r--meta/recipes-devtools/cmake/cmake.inc8
-rw-r--r--meta/recipes-devtools/cmake/cmake/0001-KWIML-tests-Remove-format-security-from-flags.patch33
-rw-r--r--meta/recipes-devtools/cmake/cmake/avoid-gcc-warnings-with-Wstrict-prototypes.patch42
-rw-r--r--meta/recipes-devtools/cmake/cmake_3.8.2.bb (renamed from meta/recipes-devtools/cmake/cmake_3.7.2.bb)1
5 files changed, 5 insertions, 80 deletions
diff --git a/meta/recipes-devtools/cmake/cmake-native_3.7.2.bb b/meta/recipes-devtools/cmake/cmake-native_3.8.2.bb
index 7ad4345efe..e55e8b1cf6 100644
--- a/meta/recipes-devtools/cmake/cmake-native_3.7.2.bb
+++ b/meta/recipes-devtools/cmake/cmake-native_3.8.2.bb
@@ -18,6 +18,7 @@ CMAKE_EXTRACONF = "\
18 -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=0 \ 18 -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=0 \
19 -DCMAKE_USE_SYSTEM_LIBRARY_LIBARCHIVE=0 \ 19 -DCMAKE_USE_SYSTEM_LIBRARY_LIBARCHIVE=0 \
20 -DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=0 \ 20 -DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=0 \
21 -DCMAKE_USE_SYSTEM_LIBRARY_LIBRHASH=0 \
21 -DENABLE_ACL=0 -DHAVE_ACL_LIBACL_H=0 \ 22 -DENABLE_ACL=0 -DHAVE_ACL_LIBACL_H=0 \
22 -DHAVE_SYS_ACL_H=0 \ 23 -DHAVE_SYS_ACL_H=0 \
23" 24"
diff --git a/meta/recipes-devtools/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc
index 6c8b36d18d..dbd34f542c 100644
--- a/meta/recipes-devtools/cmake/cmake.inc
+++ b/meta/recipes-devtools/cmake/cmake.inc
@@ -6,7 +6,7 @@ HOMEPAGE = "http://www.cmake.org/"
6BUGTRACKER = "http://public.kitware.com/Bug/my_view_page.php" 6BUGTRACKER = "http://public.kitware.com/Bug/my_view_page.php"
7SECTION = "console/utils" 7SECTION = "console/utils"
8LICENSE = "BSD" 8LICENSE = "BSD"
9LIC_FILES_CHKSUM = "file://Copyright.txt;md5=7a64bc564202bf7401d9a8ef33c9564d \ 9LIC_FILES_CHKSUM = "file://Copyright.txt;md5=8d8c7bc32f8797d23f5cf605d9339d2d \
10 file://Source/cmake.h;beginline=1;endline=3;md5=4494dee184212fc89c469c3acd555a14" 10 file://Source/cmake.h;beginline=1;endline=3;md5=4494dee184212fc89c469c3acd555a14"
11 11
12CMAKE_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:2])}" 12CMAKE_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:2])}"
@@ -14,12 +14,10 @@ CMAKE_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:2])}"
14SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \ 14SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \
15 file://support-oe-qt4-tools-names.patch \ 15 file://support-oe-qt4-tools-names.patch \
16 file://qt4-fail-silent.patch \ 16 file://qt4-fail-silent.patch \
17 file://avoid-gcc-warnings-with-Wstrict-prototypes.patch \
18 file://0001-KWIML-tests-Remove-format-security-from-flags.patch \
19 " 17 "
20 18
21SRC_URI[md5sum] = "79bd7e65cd81ea3aa2619484ad6ff25a" 19SRC_URI[md5sum] = "b5dff61f6a7f1305271ab3f6ae261419"
22SRC_URI[sha256sum] = "dc1246c4e6d168ea4d6e042cfba577c1acd65feea27e56f5ff37df920c30cae0" 20SRC_URI[sha256sum] = "da3072794eb4c09f2d782fcee043847b99bb4cf8d4573978d9b2024214d6e92d"
23 21
24UPSTREAM_CHECK_REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar" 22UPSTREAM_CHECK_REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar"
25 23
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 @@
1From 0941395b146804abcd87004589ff6e7a2953412d Mon Sep 17 00:00:00 2001
2From: Jussi Kukkonen <jussi.kukkonen@intel.com>
3Date: Thu, 16 Mar 2017 14:39:04 +0200
4Subject: [PATCH] KWIML tests: Remove format-security from flags
5
6For the tests where "format" is removed from flags, "format-security"
7should 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
12Upstream-Status: Backport [part of commit f77420cfc9]
13Signed-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
18diff --git a/Utilities/KWIML/test/CMakeLists.txt b/Utilities/KWIML/test/CMakeLists.txt
19index 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--
322.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 @@
1From 4bc17345c01ea467099e28c7df30c23ace9e7811 Mon Sep 17 00:00:00 2001
2From: Andre McCurdy <armccurdy@gmail.com>
3Date: Fri, 14 Oct 2016 16:26:58 -0700
4Subject: [PATCH] CheckFunctionExists.c: avoid gcc warnings with
5 -Wstrict-prototypes
6
7Avoid warnings (and therefore build failures etc) if a user happens
8to 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
20Upstream-Status: Pending
21
22Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
23---
24 Modules/CheckFunctionExists.c | 2 +-
25 1 file changed, 1 insertion(+), 1 deletion(-)
26
27diff --git a/Modules/CheckFunctionExists.c b/Modules/CheckFunctionExists.c
28index 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--
411.9.1
42
diff --git a/meta/recipes-devtools/cmake/cmake_3.7.2.bb b/meta/recipes-devtools/cmake/cmake_3.8.2.bb
index f566a48cfb..3f8fd7a997 100644
--- a/meta/recipes-devtools/cmake/cmake_3.7.2.bb
+++ b/meta/recipes-devtools/cmake/cmake_3.8.2.bb
@@ -28,6 +28,7 @@ EXTRA_OECMAKE=" \
28 -DCMAKE_USE_SYSTEM_LIBRARIES=1 \ 28 -DCMAKE_USE_SYSTEM_LIBRARIES=1 \
29 -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=0 \ 29 -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=0 \
30 -DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=0 \ 30 -DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=0 \
31 -DCMAKE_USE_SYSTEM_LIBRARY_LIBRHASH=0 \
31 -DKWSYS_CHAR_IS_SIGNED=1 \ 32 -DKWSYS_CHAR_IS_SIGNED=1 \
32 -DBUILD_CursesDialog=0 \ 33 -DBUILD_CursesDialog=0 \
33 -DKWSYS_LFS_WORKS=1 \ 34 -DKWSYS_LFS_WORKS=1 \