Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/1] mpv: disable static build with qt-zlib
@ 2018-11-02 18:24 Fabrice Fontaine
  2018-11-03 13:26 ` Thomas Petazzoni
  0 siblings, 1 reply; 4+ messages in thread
From: Fabrice Fontaine @ 2018-11-02 18:24 UTC (permalink / raw)
  To: buildroot

Static build of mpv with qt-zlib will fail because zlib and qt-zlib
defines the same functions (inflateReset, inflatePrime ...)

So add a dependency on !(BR2_STATIC_LIBS && BR2_PACKAGE_QT_QTZLIB)

Theoretically, this dependency should be put on zlib package on all its
reverse dependencies but this make a lot of packages

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

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/mpv/Config.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/mpv/Config.in b/package/mpv/Config.in
index 69810038f1..a2b023868a 100644
--- a/package/mpv/Config.in
+++ b/package/mpv/Config.in
@@ -4,6 +4,7 @@ config BR2_PACKAGE_MPV
 	depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_5
 	depends on BR2_TOOLCHAIN_HAS_ATOMIC || BR2_TOOLCHAIN_HAS_SYNC_8
+	depends on !(BR2_STATIC_LIBS && BR2_PACKAGE_QT_QTZLIB)
 	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
 	select BR2_PACKAGE_FFMPEG
 	select BR2_PACKAGE_FFMPEG_SWSCALE
@@ -25,5 +26,6 @@ config BR2_PACKAGE_MPV
 comment "mpv needs a toolchain w/ threads, gcc >= 4.5"
 	depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS
 	depends on BR2_TOOLCHAIN_HAS_ATOMIC || BR2_TOOLCHAIN_HAS_SYNC_8
+	depends on !(BR2_STATIC_LIBS && BR2_PACKAGE_QT_QTZLIB)
 	depends on !BR2_TOOLCHAIN_HAS_THREADS || \
 		!BR2_TOOLCHAIN_GCC_AT_LEAST_4_5
-- 
2.17.1

^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2018-11-04 10:20 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-11-02 18:24 [Buildroot] [PATCH 1/1] mpv: disable static build with qt-zlib Fabrice Fontaine
2018-11-03 13:26 ` Thomas Petazzoni
2018-11-03 22:15   ` Arnout Vandecappelle
2018-11-04 10:20     ` Thomas Petazzoni

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox