Skip to contentSkip to conversation

qt: disable static build for qt-zlib

PATCH New Fabrice Fontaine 3 participants 3 messages Nov 8, 2018 – Nov 25, 2018

lore
Share & tools
lore

Fabrice Fontaine

author
#0 lore raw

PATCH 1/1 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 <[email protected]>
---
 package/qt/Config.in | 4 ++++
 1 file changed, 4 insertions(+)
package/qt/Config.in +4 -0
index 0ecfafada5..a1218ecf39 100644
@@ -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
Signature · 1 line
2.17.1
Applied
#1 lore raw

PATCH 1/1 qt: disable static build for qt-zlib

Hello,

Quoted 6 lines · Fabrice Fontaine

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

Quoted 7 lines

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

Signed-off-by Fabrice Fontaine <[email protected]>
---
 package/qt/Config.in | 4 ++++
 1 file changed, 4 insertions(+)

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#2 lore raw

PATCH 1/1 qt: disable static build for qt-zlib

In reply to Fabrice Fontaine
Quoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Fabrice" == Fabrice Fontaine <[email protected]> writes:

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 ...)

Quoted 6 lines

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 <[email protected]>

Committed to 2018.02.x and 2018.08.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard