mirror of
https://git.yoctoproject.org/poky
synced 2026-04-26 00:32:12 +02:00
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>
This commit is contained in:
committed by
Richard Purdie
parent
d654085025
commit
c4a9d4682d
@@ -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"
|
||||
|
||||
|
||||
@@ -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()
|
||||
Reference in New Issue
Block a user