Drop a patch which is no longer required as the issue has been fixed
upstream.
Signed-off-by: Anuj Mittal <anuj.mit...@intel.com>
---
...ative_3.19.3.bb => cmake-native_3.19.5.bb} | 0
meta/recipes-devtools/cmake/cmake.inc | 3 +--
...cmake-do-not-try-to-run-the-test-bin.patch | 26 -------------------
.../{cmake_3.19.3.bb => cmake_3.19.5.bb} | 0
4 files changed, 1 insertion(+), 28 deletions(-)
rename meta/recipes-devtools/cmake/{cmake-native_3.19.3.bb =>
cmake-native_3.19.5.bb} (100%)
delete mode 100644
meta/recipes-devtools/cmake/cmake/0001-cm_cxx_features.cmake-do-not-try-to-run-the-test-bin.patch
rename meta/recipes-devtools/cmake/{cmake_3.19.3.bb => cmake_3.19.5.bb} (100%)
diff --git a/meta/recipes-devtools/cmake/cmake-native_3.19.3.bb
b/meta/recipes-devtools/cmake/cmake-native_3.19.5.bb
similarity index 100%
rename from meta/recipes-devtools/cmake/cmake-native_3.19.3.bb
rename to 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.kana...@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.kana...@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
similarity index 100%
rename from meta/recipes-devtools/cmake/cmake_3.19.3.bb
rename to meta/recipes-devtools/cmake/cmake_3.19.5.bb
--
2.29.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#148273):
https://lists.openembedded.org/g/openembedded-core/message/148273
Mute This Topic: https://lists.openembedded.org/mt/80722754/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
