diff options
| author | Fabrice Fontaine <fontaine.fabrice@gmail.com> | 2018-11-08 20:28:29 +0100 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@bootlin.com> | 2018-11-08 21:00:49 +0100 |
| commit | 112667fd120d136bcacef7e4a78f16a4ac92178a (patch) | |
| tree | 3e9515a7a3132c8b24ac0eee1f995daa8521808b | |
| parent | f680e57e48c8e1f909b781a6d1789e99a6457db8 (diff) | |
| download | buildroot-112667fd120d136bcacef7e4a78f16a4ac92178a.tar.gz buildroot-112667fd120d136bcacef7e4a78f16a4ac92178a.zip | |
qt: disable static build for qt-zlib
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>
| -rw-r--r-- | package/qt/Config.in | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/package/qt/Config.in b/package/qt/Config.in index 0ecfafada5..a1218ecf39 100644 --- a/package/qt/Config.in +++ b/package/qt/Config.in @@ -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 |
