From a565bccb0722fa3f76de4aa33c0f1d4cdc819a0b Mon Sep 17 00:00:00 2001 From: Michal Klocek Date: Wed, 25 May 2022 12:24:47 +0200 Subject: [PATCH] Add zlib dependency for qtbase Zlib is mandatory dependency, meaning if there is no system one qt will do bundled one. This is important to know which one is used as webengine will try to build also bundled one. Task-number: QTBUG-103149 Pick-to: 6.4 6.3 6.2 Change-Id: Ie7cc83dea558a5605295133fb0bf6fe0a3217492 Reviewed-by: Samuli Piippo --- recipes-qt/qt6/qtbase_git.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipes-qt/qt6/qtbase_git.bb b/recipes-qt/qt6/qtbase_git.bb index eef143e..ffff5bd 100644 --- a/recipes-qt/qt6/qtbase_git.bb +++ b/recipes-qt/qt6/qtbase_git.bb @@ -58,7 +58,7 @@ PACKAGECONFIG_FONTS ?= "" PACKAGECONFIG_SYSTEM ?= "" PACKAGECONFIG_DISTRO ?= "" PACKAGECONFIG_DEFAULT ?= "accessibility dbus udev gui widgets icu openssl \ - jpeg png dbus libinput fontconfig harfbuzz \ + jpeg png dbus libinput fontconfig harfbuzz zlib \ ${@bb.utils.contains('SELECTED_OPTIMIZATION', '-Os', 'optimize-size ltcg', '', d)} \ ${@bb.utils.contains('BBFILE_COLLECTIONS', 'openembedded-layer', 'zstd', '', d)} \ " @@ -82,6 +82,7 @@ PACKAGECONFIG[developer-build] = "-DFEATURE_developer_build=ON,-DFEATURE_develop PACKAGECONFIG[cups] = "-DFEATURE_cups=ON,-DFEATURE_cups=OFF,cups" PACKAGECONFIG[dbus] = "-DFEATURE_dbus=ON,-DFEATURE_dbus=OFF,dbus" PACKAGECONFIG[udev] = "-DFEATURE_libudev=ON,-DFEATURE_libudev=OFF,udev" +PACKAGECONFIG[zlib] = "-DFEATURE_system_zlib=ON,-DFEATURE_system_zlib=OFF,zlib" PACKAGECONFIG[zstd] = "-DFEATURE_zstd=ON,-DFEATURE_zstd=OFF,zstd" # corelib