diff options
| author |   Anuj Mittal <anuj.mittal@intel.com> | 2021-02-18 12:24:07 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-02-19 10:59:57 +0000 |
| commit | 5a6456bc0ded09d184987a70764ecb3c94be4ddd (patch) | |
| tree | 502891cb882d972b1e777a21497e516e018c489c /meta/recipes-devtools/cmake | |
| parent | ee8f778252d1c741b45aca419867ef29d3398890 (diff) | |
| download | openembedded-core-5a6456bc0ded09d184987a70764ecb3c94be4ddd.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.
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/cmake')
| -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.inc | 3 | ||||
| -rw-r--r-- | meta/recipes-devtools/cmake/cmake/0001-cm_cxx_features.cmake-do-not-try-to-run-the-test-bin.patch | 26 | ||||
| -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 \ file://0002-cmake-Prevent-the-detection-of-Qt5.patch \ file://0003-cmake-support-OpenEmbedded-Qt4-tool-binary-names.patch \ file://0004-Fail-silently-if-system-Qt-installation-is-broken.patch \ - file://0001-cm_cxx_features.cmake-do-not-try-to-run-the-test-bin.patch \ " -SRC_URI[sha256sum] = "3faca7c131494a1e34d66e9f8972ff5369e48d419ea8ceaa3dc15b4c11367732" +SRC_URI[sha256sum] = "c432296eb5dec6d71eae15d140f6297d63df44e9ffe3e453628d1dc8fc4201ce" UPSTREAM_CHECK_REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar" 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 @@ -From ca105727dc4862733c3aad09e9de819be63a7b6b Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Sun, 27 Dec 2020 23:18:10 +0100 -Subject: [PATCH] cm_cxx_features.cmake: do not try to run the test binary - -This causes errors when cross compiling cmake. - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - Source/Checks/cm_cxx_features.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Source/Checks/cm_cxx_features.cmake b/Source/Checks/cm_cxx_features.cmake -index 663d89a..e8dca3b 100644 ---- a/Source/Checks/cm_cxx_features.cmake -+++ b/Source/Checks/cm_cxx_features.cmake -@@ -81,7 +81,7 @@ if(CMake_HAVE_CXX_MAKE_UNIQUE) - endif() - cm_check_cxx_feature(unique_ptr) - if (NOT CMAKE_CXX_STANDARD LESS "17") -- cm_check_cxx_feature(filesystem TRY_RUN) -+ cm_check_cxx_feature(filesystem) - else() - set(CMake_HAVE_CXX_FILESYSTEM FALSE) - 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 |