diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2023-01-11 13:20:54 +0000 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-01-11 19:38:44 +0000 |
| commit | 79ee80eef51c18248e382811a8915354774dd421 (patch) | |
| tree | ab59d1ae62a7455f244934c4f3a6b485a6f2d434 | |
| parent | 6d70fc56a540bb0e5be80f7434769b4de296b6ae (diff) | |
Add workaround for broken harfbuzz cmake config
Latest harfbuzz 6.0.0 has bad cmake config that uses absolute paths,
which breaks static builds for Qt. Add workaroud that causes Qt
to use pkg-config to find correct paths for libs and includes.
From qtshadertools build:
ninja: error: '/usr/lib/libharfbuzz.so.0.60000.0', needed by
'lib/libQt6ShaderTools.a', missing and no known rule to make it
Change-Id: I9f8bca0d4b9648e58c008e4064ff4f7b88f5f4f0
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 23feda4f5bce923db0aa5a4d1a16af43ed08edb6)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | classes/qt6-cmake.bbclass | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/classes/qt6-cmake.bbclass b/classes/qt6-cmake.bbclass index 319fe5f..9671704 100644 --- a/classes/qt6-cmake.bbclass +++ b/classes/qt6-cmake.bbclass @@ -12,6 +12,7 @@ QT_FORCE_BUILD_TOOLS ?= "OFF" EXTRA_OECMAKE:append:class-target = "\ -DQT_HOST_PATH:PATH=${RECIPE_SYSROOT_NATIVE}${prefix_native}/ \ -DQT_FORCE_BUILD_TOOLS=${QT_FORCE_BUILD_TOOLS} \ + -D__harfbuzz_broken_config_file=TRUE \ " EXTRA_OECMAKE:append:class-nativesdk = "\ -DQT_HOST_PATH:PATH=${RECIPE_SYSROOT_NATIVE}${prefix_native}/ \ |