mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-09 07:51:59 -09:00
Code Issues Packages Projects Releases Wiki Activity

qt: disable static build for qt-zlib

Browse Source 
Static build of applications using qt-zlib and zlib (such as mpv) will
fail because zlib and qt-zlib defines the same functions (inflateReset,
inflatePrime ...)

So add a dependency on !BR2_STATIC_LIBS on BR2_PACKAGE_QT_QTZLIB

Fixes:
 - http://autobuild.buildroot.org/results/0be6e359d46a8a701006305c32b514687854b035

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit 112667fd12)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Fabrice Fontaine
2018-11-08 20:28:29 +01:00
committed by Peter Korsgaard
parent 837bae2539
commit 1b03e57bbe
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
package/qt/Config.in
View File

@@ -309,9 +309,13 @@ choice
config BR2_PACKAGE_QT_QTZLIB
bool "Qt zlib"
depends on !BR2_STATIC_LIBS
help
Use the zlib bundled with Qt.
comment "Qt zlib needs a toolchain w/ dynamic library"
depends on BR2_STATIC_LIBS
config BR2_PACKAGE_QT_SYSTEMZLIB
bool "System zlib"
select BR2_PACKAGE_ZLIB