diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2023-12-22 10:54:09 +0200 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2023-12-27 11:06:41 +0200 |
| commit | 7e80a1296ccf82cbbc8838a74ea1a145ca007913 (patch) | |
| tree | 962aa8af15a1d40d395e10297c94d106285f64c0 | |
| parent | 04f8e6b271b2c565b42a52c9779db6f3d82876df (diff) | |
webengine: update patch
Change-Id: I2c9df3bde7b0c6776cfd3a32093047fad1bd7256
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
| -rw-r--r-- | recipes-qt/qt6/qtwebengine/0001-CMake-use-generated-yocto-toolchains.patch | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/recipes-qt/qt6/qtwebengine/0001-CMake-use-generated-yocto-toolchains.patch b/recipes-qt/qt6/qtwebengine/0001-CMake-use-generated-yocto-toolchains.patch index 89e8a6a..62b376b 100644 --- a/recipes-qt/qt6/qtwebengine/0001-CMake-use-generated-yocto-toolchains.patch +++ b/recipes-qt/qt6/qtwebengine/0001-CMake-use-generated-yocto-toolchains.patch @@ -1,4 +1,4 @@ -From e6aff8d72eda7d3ea782779a4e45cf43e42b800a Mon Sep 17 00:00:00 2001 +From efa68fdedbec60380946f69a6a2f985958148e83 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 @@ -10,14 +10,13 @@ target binaries where needed. Upstream-Status: Inappropriate [embedded specific] Change-Id: I217c9122144f25bb2d28717e7248c2a51b149127 - --- cmake/Functions.cmake | 12 +++++------- src/CMakeLists.txt | 2 +- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/cmake/Functions.cmake b/cmake/Functions.cmake -index b90447ed3..a63145b28 100644 +index 3371e5ff5..ac889d3f7 100644 --- a/cmake/Functions.cmake +++ b/cmake/Functions.cmake @@ -825,7 +825,7 @@ endfunction() @@ -29,9 +28,9 @@ index b90447ed3..a63145b28 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() -@@ -1073,15 +1073,13 @@ macro(append_toolchain_setup) - endif() - if(LINUX) +@@ -1097,14 +1097,12 @@ macro(append_toolchain_setup) + elseif(LINUX) + get_gn_arch(cpu ${TEST_architecture_arch}) list(APPEND gnArgArg - custom_toolchain="${buildDir}/target_toolchain:target" - host_toolchain="${buildDir}/host_toolchain:host" @@ -39,7 +38,6 @@ index b90447ed3..a63145b28 100644 + host_toolchain="//build/toolchain/yocto:yocto_native" + v8_snapshot_toolchain="//build/toolchain/yocto:yocto_target" ) - get_gn_arch(cpu ${TEST_architecture_arch}) if(CMAKE_CROSSCOMPILING) - list(APPEND gnArgArg - v8_snapshot_toolchain="${buildDir}/v8_toolchain:v8" @@ -50,10 +48,10 @@ index b90447ed3..a63145b28 100644 list(APPEND gnArgArg host_cpu="${cpu}") endif() diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 59eb27e73..b9c8f2b7f 100644 +index 0084697f2..1c9059ae6 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -157,7 +157,7 @@ endif() +@@ -161,7 +161,7 @@ endif() # HOST PROJECT ## |