diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2022-10-10 08:43:30 +0000 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-10-10 17:29:23 +0000 |
| commit | 25fde8d225bbd10944d1169c0589b93b283c7b2d (patch) | |
| tree | 0d2241742f615fa306a05bcf8f875e1a065376c7 | |
| parent | c8b5b038b8d0172df87cd2602030b9b689aa6143 (diff) | |
qtbase: avoid cmake archiving api for native build
After 812bf25183c440dd28dcadaa7732d8f088b134f1, we need to extend the
workaround for badly configured CMake also to qtbase-native. This fixes
error: CMake was not built with zstd support. Rebuild CMake or
set QT_AVOID_CMAKE_ARCHIVING_API=ON.
Fixes: WEBOSCI-54
Change-Id: I33c97b1a051fe90d706461c83f75912aa1c1c820
Reviewed-by: Janne Juntunen <janne.juntunen@qt.io>
(cherry picked from commit 0bb5361fe0495e23e451869fc10faeb29a825571)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | recipes-qt/qt6/qtbase_git.bb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/recipes-qt/qt6/qtbase_git.bb b/recipes-qt/qt6/qtbase_git.bb index 0c35fb4..d3b7ace 100644 --- a/recipes-qt/qt6/qtbase_git.bb +++ b/recipes-qt/qt6/qtbase_git.bb @@ -134,12 +134,12 @@ PACKAGECONFIG[sql-sqlite] = "-DFEATURE_system_sqlite=ON,-DFEATURE_sql_sqlite=OFF EXTRA_OECMAKE += "\ -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \ -DQT_EDITION=${QT_EDITION} \ + -DQT_AVOID_CMAKE_ARCHIVING_API=ON \ " EXTRA_OECMAKE:append:class-target = "\ -DFEATURE_rpath=OFF \ -DQT_QPA_DEFAULT_PLATFORM=${QT_QPA_DEFAULT_PLATFORM} \ - -DQT_AVOID_CMAKE_ARCHIVING_API=ON \ ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', '-DFEATURE_use_gold_linker=ON', '-DFEATURE_use_bfd_linker=ON', d)} \ " |