CaROS/meta-qt6
3
0
Fork 0
mirror of http://code.qt.io/yocto/meta-qt6.git synced 2026-01-01 13:58:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

qtwebengine: update patch

Browse Source 
Change-Id: I9647cba85fd4a9fcd0aadba1273b077b7ae6c844
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 682313136d)
This commit is contained in:
Samuli Piippo 2022-05-09 11:32:39 +00:00
parent eabb084248
commit c51ee614ce
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
recipes-qt/qt6/qtwebengine/0001-CMake-use-generated-yocto-toolchains.patch
View File

@ -1,4 +1,4 @@
From 271b265784767476101f64f51e87abdeeae18108 Mon Sep 17 00:00:00 2001
From 6819917c14b55c4352dbd200bb6ab297bfd243fa Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Wed, 18 Aug 2021 15:09:41 +0300
Subject: [PATCH] CMake: use generated yocto toolchains
@ -16,7 +16,7 @@ Change-Id: I217c9122144f25bb2d28717e7248c2a51b149127
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/cmake/Functions.cmake b/cmake/Functions.cmake
index 08967d6db..cebeae8eb 100644
index 89f4cdd39..8845c94f7 100644
--- a/cmake/Functions.cmake
+++ b/cmake/Functions.cmake
@@ -750,7 +750,7 @@ endfunction()
@ -28,7 +28,7 @@ index 08967d6db..cebeae8eb 100644
create_pkg_config_wrapper("${buildDir}/pkg-config-host_wrapper.sh" "${PKG_CONFIG_HOST_EXECUTABLE}")
set(PKG_CONFIG_HOST_EXECUTABLE "${buildDir}/pkg-config-host_wrapper.sh")
endif()
@@ -972,9 +972,9 @@ endmacro()
@@ -979,9 +979,9 @@ endmacro()
macro(append_toolchain_setup)
if(LINUX)
list(APPEND gnArgArg
@ -42,14 +42,14 @@ index 08967d6db..cebeae8eb 100644
get_gn_arch(cpu ${TEST_architecture_arch})
if(CMAKE_CROSSCOMPILING)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 31123d06c..c6141988b 100644
index 921871bee..c6141988b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -151,7 +151,7 @@ endif()
# HOST PROJECT
##
-if(CMAKE_CROSSCOMPILING AND NOT IOS)
-if(CMAKE_CROSSCOMPILING AND NOT IOS AND NOT MACOS)
+if(FALSE)
if(NOT Gn_FOUND)