qt: disable static build for qt-zlib
authorFabrice Fontaine <fontaine.fabrice@gmail.com>
Thu, 8 Nov 2018 19:28:29 +0000 (20:28 +0100)
committerThomas Petazzoni <thomas.petazzoni@bootlin.com>
Thu, 8 Nov 2018 20:00:49 +0000 (21:00 +0100)
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>
package/qt/Config.in

index 0ecfafada59b2181ddd6af7a14ca4d0a7e1f0752..a1218ecf39837648687de6e26da56705af07823d 100644 (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