From 5395b1ca450aff8823b77c2910ead19f727f4651 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 1 Jun 2019 16:34:56 +0200 Subject: [PATCH] package/mpd: fix static build with tremor and vorbis mpd can't be built statically with tremor and vorbis, build fails on: block.c:(.text+0x11c): multiple definition of `vorbis_block_init' /usr/lfs/v0/rc-buildroot-test/scripts/instance-2/output/host/bin/../sparc-buildroot-linux-uclibc/sysroot/usr/lib/libvorbisidec.a(block.o):block.c:(.text+0x0): first defined here /usr/lfs/v0/rc-buildroot-test/scripts/instance-2/output/host/opt/ext-toolchain/bin/../lib/gcc/sparc-buildroot-linux-uclibc/7.4.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: Disabling relaxation: it will not work with multiple definitions /usr/lfs/v0/rc-buildroot-test/scripts/instance-2/output/host/bin/../sparc-buildroot-linux-uclibc/sysroot/usr/lib/libvorbis.a(block.o): In function `_vorbis_block_alloc': Fix this by making both options mutually exclusive It should be noted that upstream explicitly removed the possibility to enable tremor and vorbis at the same time since version 0.21.6 and https://github.com/MusicPlayerDaemon/MPD/commit/c18cd941aaa4c16ac713bc4f1e16ada5281d689e Since we only have 0.20.23, it is still possible to build them together, but there is clearly no need to allow it. Fixes: - http://autobuild.buildroot.org/results/60c721a82ffd668bebf02d80bca83780d6cdb2f2 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/mpd/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/mpd/Config.in b/package/mpd/Config.in index 20a7421481..923f0c2201 100644 --- a/package/mpd/Config.in +++ b/package/mpd/Config.in @@ -132,6 +132,7 @@ config BR2_PACKAGE_MPD_OPUS config BR2_PACKAGE_MPD_TREMOR bool "tremor" + depends on !BR2_PACKAGE_MPD_VORBIS select BR2_PACKAGE_LIBOGG select BR2_PACKAGE_TREMOR help -- 2.30.2