summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnuj Mittal <anuj.mittal@intel.com>2021-02-18 12:24:07 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-02-19 11:17:10 +0000
commitc4a9d4682d060bfa3d33a1b821ab45e6bea9de51 (patch)
tree1f5c828da4f28b9229d6631af00fbe43f3d40b30
parentd65408502572764d5497af6b067805fc3223aced (diff)
downloadpoky-c4a9d4682d060bfa3d33a1b821ab45e6bea9de51.tar.gz
cmake: upgrade 3.19.3 -> 3.19.5
Drop a patch which is no longer required as the issue has been fixed upstream. (From OE-Core rev: 5a6456bc0ded09d184987a70764ecb3c94be4ddd) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/cmake/cmake-native_3.19.5.bb (renamed from meta/recipes-devtools/cmake/cmake-native_3.19.3.bb)0
-rw-r--r--meta/recipes-devtools/cmake/cmake.inc3
-rw-r--r--meta/recipes-devtools/cmake/cmake/0001-cm_cxx_features.cmake-do-not-try-to-run-the-test-bin.patch26
-rw-r--r--meta/recipes-devtools/cmake/cmake_3.19.5.bb (renamed from meta/recipes-devtools/cmake/cmake_3.19.3.bb)0
4 files changed, 1 insertions, 28 deletions
diff --git a/meta/recipes-devtools/cmake/cmake-native_3.19.3.bb b/meta/recipes-devtools/cmake/cmake-native_3.19.5.bb
index d91e42ef9a..d91e42ef9a 100644
--- a/meta/recipes-devtools/cmake/cmake-native_3.19.3.bb
+++ b/meta/recipes-devtools/cmake/cmake-native_3.19.5.bb
diff --git a/meta/recipes-devtools/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc
index a79b3922bc..e0f59a6c67 100644
--- a/meta/recipes-devtools/cmake/cmake.inc
+++ b/meta/recipes-devtools/cmake/cmake.inc
@@ -20,10 +20,9 @@ SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \
20 file://0002-cmake-Prevent-the-detection-of-Qt5.patch \ 20 file://0002-cmake-Prevent-the-detection-of-Qt5.patch \
21 file://0003-cmake-support-OpenEmbedded-Qt4-tool-binary-names.patch \ 21 file://0003-cmake-support-OpenEmbedded-Qt4-tool-binary-names.patch \
22 file://0004-Fail-silently-if-system-Qt-installation-is-broken.patch \ 22 file://0004-Fail-silently-if-system-Qt-installation-is-broken.patch \
23 file://0001-cm_cxx_features.cmake-do-not-try-to-run-the-test-bin.patch \
24" 23"
25 24
26SRC_URI[sha256sum] = "3faca7c131494a1e34d66e9f8972ff5369e48d419ea8ceaa3dc15b4c11367732" 25SRC_URI[sha256sum] = "c432296eb5dec6d71eae15d140f6297d63df44e9ffe3e453628d1dc8fc4201ce"
27 26
28UPSTREAM_CHECK_REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar" 27UPSTREAM_CHECK_REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar"
29 28
diff --git a/meta/recipes-devtools/cmake/cmake/0001-cm_cxx_features.cmake-do-not-try-to-run-the-test-bin.patch b/meta/recipes-devtools/cmake/cmake/0001-cm_cxx_features.cmake-do-not-try-to-run-the-test-bin.patch
deleted file mode 100644
index 4483bbce18..0000000000
--- a/meta/recipes-devtools/cmake/cmake/0001-cm_cxx_features.cmake-do-not-try-to-run-the-test-bin.patch
+++ /dev/null
@@ -1,26 +0,0 @@
1From ca105727dc4862733c3aad09e9de819be63a7b6b Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Sun, 27 Dec 2020 23:18:10 +0100
4Subject: [PATCH] cm_cxx_features.cmake: do not try to run the test binary
5
6This causes errors when cross compiling cmake.
7
8Upstream-Status: Pending
9Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
10---
11 Source/Checks/cm_cxx_features.cmake | 2 +-
12 1 file changed, 1 insertion(+), 1 deletion(-)
13
14diff --git a/Source/Checks/cm_cxx_features.cmake b/Source/Checks/cm_cxx_features.cmake
15index 663d89a..e8dca3b 100644
16--- a/Source/Checks/cm_cxx_features.cmake
17+++ b/Source/Checks/cm_cxx_features.cmake
18@@ -81,7 +81,7 @@ if(CMake_HAVE_CXX_MAKE_UNIQUE)
19 endif()
20 cm_check_cxx_feature(unique_ptr)
21 if (NOT CMAKE_CXX_STANDARD LESS "17")
22- cm_check_cxx_feature(filesystem TRY_RUN)
23+ cm_check_cxx_feature(filesystem)
24 else()
25 set(CMake_HAVE_CXX_FILESYSTEM FALSE)
26 endif()
diff --git a/meta/recipes-devtools/cmake/cmake_3.19.3.bb b/meta/recipes-devtools/cmake/cmake_3.19.5.bb
index 64c92b89f2..64c92b89f2 100644
--- a/meta/recipes-devtools/cmake/cmake_3.19.3.bb
+++ b/meta/recipes-devtools/cmake/cmake_3.19.5.bb