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>
This commit is contained in:
Otavio Salvador
2017-06-02 15:42:43 -03:00
committed by Richard Purdie
parent 374f3d6be2
commit e3372ac0b4
5 changed files with 5 additions and 80 deletions

View File

@@ -18,6 +18,7 @@ CMAKE_EXTRACONF = "\
-DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=0 \
-DCMAKE_USE_SYSTEM_LIBRARY_LIBARCHIVE=0 \
-DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=0 \
-DCMAKE_USE_SYSTEM_LIBRARY_LIBRHASH=0 \
-DENABLE_ACL=0 -DHAVE_ACL_LIBACL_H=0 \
-DHAVE_SYS_ACL_H=0 \
"

View File

@@ -6,7 +6,7 @@ HOMEPAGE = "http://www.cmake.org/"
BUGTRACKER = "http://public.kitware.com/Bug/my_view_page.php"
SECTION = "console/utils"
LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://Copyright.txt;md5=7a64bc564202bf7401d9a8ef33c9564d \
LIC_FILES_CHKSUM = "file://Copyright.txt;md5=8d8c7bc32f8797d23f5cf605d9339d2d \
file://Source/cmake.h;beginline=1;endline=3;md5=4494dee184212fc89c469c3acd555a14"
CMAKE_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:2])}"
@@ -14,12 +14,10 @@ CMAKE_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:2])}"
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"
SRC_URI[sha256sum] = "dc1246c4e6d168ea4d6e042cfba577c1acd65feea27e56f5ff37df920c30cae0"
SRC_URI[md5sum] = "b5dff61f6a7f1305271ab3f6ae261419"
SRC_URI[sha256sum] = "da3072794eb4c09f2d782fcee043847b99bb4cf8d4573978d9b2024214d6e92d"
UPSTREAM_CHECK_REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar"

View File

@@ -1,33 +0,0 @@
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

View File

@@ -1,42 +0,0 @@
From 4bc17345c01ea467099e28c7df30c23ace9e7811 Mon Sep 17 00:00:00 2001
From: Andre McCurdy <armccurdy@gmail.com>
Date: Fri, 14 Oct 2016 16:26:58 -0700
Subject: [PATCH] CheckFunctionExists.c: avoid gcc warnings with
-Wstrict-prototypes
Avoid warnings (and therefore build failures etc) if a user happens
to add -Wstrict-prototypes to CFLAGS.
| $ gcc --version
| gcc (Ubuntu 4.8.4-2ubuntu1~14.04.3) 4.8.4
|
| $ gcc -Wstrict-prototypes -Werror -DCHECK_FUNCTION_EXISTS=pthread_create -o foo.o -c Modules/CheckFunctionExists.c
| Modules/CheckFunctionExists.c:7:3: error: function declaration isn't a prototype [-Werror=strict-prototypes]
| CHECK_FUNCTION_EXISTS();
| ^
| cc1: all warnings being treated as errors
|
Upstream-Status: Pending
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
---
Modules/CheckFunctionExists.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Modules/CheckFunctionExists.c b/Modules/CheckFunctionExists.c
index 2304000..224e340 100644
--- a/Modules/CheckFunctionExists.c
+++ b/Modules/CheckFunctionExists.c
@@ -4,7 +4,7 @@
extern "C"
#endif
char
- CHECK_FUNCTION_EXISTS();
+ CHECK_FUNCTION_EXISTS(void);
#ifdef __CLASSIC_C__
int main()
{
--
1.9.1

View File

@@ -28,6 +28,7 @@ EXTRA_OECMAKE=" \
-DCMAKE_USE_SYSTEM_LIBRARIES=1 \
-DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=0 \
-DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=0 \
-DCMAKE_USE_SYSTEM_LIBRARY_LIBRHASH=0 \
-DKWSYS_CHAR_IS_SIGNED=1 \
-DBUILD_CursesDialog=0 \
-DKWSYS_LFS_WORKS=1 \