aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Fabrice Fontaine <fontaine.fabrice@gmail.com>2019-06-01 16:34:56 +0200
committerGravatar Peter Korsgaard <peter@korsgaard.com>2019-06-23 21:19:45 +0200
commitfad7b2f590f8e9f0ffd3f3e15b7fe4db9af145b2 (patch)
treeed1145525788bc04203abc5c435310a13a887aec
parent441038cd8307301cd8297772dd51699b43258aa3 (diff)
downloadbuildroot-fad7b2f590f8e9f0ffd3f3e15b7fe4db9af145b2.tar.gz
buildroot-fad7b2f590f8e9f0ffd3f3e15b7fe4db9af145b2.tar.bz2
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 <fontaine.fabrice@gmail.com> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> (cherry picked from commit 5395b1ca450aff8823b77c2910ead19f727f4651) Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--package/mpd/Config.in1
1 files changed, 1 insertions, 0 deletions
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