Skip to contentSkip to conversation

package/mpd: fix static build with tremor and vorbis

PATCH Superseded Fabrice Fontaine 2 participants 5 messages Jun 1, 2019

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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 enabling vorbis or tremor depending on BR2_SOFT_FLOAT value as suggested by J?rg in https://patchwork.ozlabs.org/patch/1085899

It should be noted that upstream 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

Fixes:
- http://autobuild.buildroot.org/results/60c721a82ffd668bebf02d80bca83780d6cdb2f2

---
 package/mpd/Config.in | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
package/mpd/Config.in +4 -3
index d3844391a2..039c2402c2 100644
@@ -9,7 +9,6 @@ menuconfig BR2_PACKAGE_MPD
 	depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # exception_ptr
 	select BR2_PACKAGE_BOOST
 	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
-	select BR2_PACKAGE_MPD_TREMOR if !(BR2_PACKAGE_MPD_MAD || BR2_PACKAGE_MPD_MPG123 || BR2_PACKAGE_MPD_VORBIS || BR2_PACKAGE_MPD_WAVPACK || BR2_PACKAGE_MPD_FLAC || BR2_PACKAGE_MPD_MUSEPACK || BR2_PACKAGE_MPD_FFMPEG)
 	help
 	  MPD is a flexible, powerful, server-side application
 	  for playing music. Through plugins and libraries
@@ -132,18 +131,20 @@ config BR2_PACKAGE_MPD_OPUS
 	  Select this if you want to play back OPUS encoded files.
 
 config BR2_PACKAGE_MPD_TREMOR
-	bool "tremor"
+	bool "tremor" if !BR2_SOFT_FLOAT
 	select BR2_PACKAGE_LIBOGG
 	select BR2_PACKAGE_TREMOR
+	default y if !BR2_SOFT_FLOAT
 	help
 	  Enable vorbis input support.
 	  Select this if you want to play back OGG files on softfloat
 	  targets.
 
 config BR2_PACKAGE_MPD_VORBIS
-	bool "vorbis"
+	bool "vorbis" if BR2_SOFT_FLOAT
 	select BR2_PACKAGE_LIBOGG
 	select BR2_PACKAGE_LIBVORBIS
+	default y if BR2_SOFT_FLOAT
 	help
 	  Enable vorbis input/streaming support.
 	  Select this if you want to play back OGG files on hardfloat
Signature · 1 line
2.20.1
#1 lore raw

PATCH 1/1 package/mpd: fix static build with tremor and vorbis

Hello Fabrice,

package/mpd/Config.in menuconfig BR2_PACKAGE_MPD · line 12

Quoted 9 lines · On Sat, 1 Jun 2019 14:42:31 +0200 Fabrice Fontaine…
package/mpd/Config.in +0 -1
index d3844391a2..039c2402c2 100644
@@ -9,7 +9,6 @@ menuconfig BR2_PACKAGE_MPD
 	depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # exception_ptr
 	select BR2_PACKAGE_BOOST
 	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
-	select BR2_PACKAGE_MPD_TREMOR if !(BR2_PACKAGE_MPD_MAD || BR2_PACKAGE_MPD_MPG123 || BR2_PACKAGE_MPD_VORBIS || BR2_PACKAGE_MPD_WAVPACK || BR2_PACKAGE_MPD_FLAC || BR2_PACKAGE_MPD_MUSEPACK || BR2_PACKAGE_MPD_FFMPEG)

Why was this select here in the first place ? Does it build fine with no sub-option enabled ?

Quoted 6 lines
package/mpd/Config.in +0 -0
 	help
 	  MPD is a flexible, powerful, server-side application
 	  for playing music. Through plugins and libraries
@@ -132,18 +131,20 @@ config BR2_PACKAGE_MPD_OPUS
 	  Select this if you want to play back OPUS encoded files.
 

package/mpd/Config.in config BR2_PACKAGE_MPD_OPUS · line 141

Quoted 10 lines
package/mpd/Config.in +2 -1
 config BR2_PACKAGE_MPD_TREMOR
-	bool "tremor"
+	bool "tremor" if !BR2_SOFT_FLOAT
 	select BR2_PACKAGE_LIBOGG
 	select BR2_PACKAGE_TREMOR
+	default y if !BR2_SOFT_FLOAT
 	help
 	  Enable vorbis input support.
 	  Select this if you want to play back OGG files on softfloat
 	  targets.

So for soft float targets, we should use tremor, but you make it depend on !BR2_SOFT_FLOAT.

package/mpd/Config.in config BR2_PACKAGE_MPD_OPUS · line 150

Quoted 9 lines
package/mpd/Config.in +2 -1
 config BR2_PACKAGE_MPD_VORBIS
-	bool "vorbis"
+	bool "vorbis" if BR2_SOFT_FLOAT
 	select BR2_PACKAGE_LIBOGG
 	select BR2_PACKAGE_LIBVORBIS
+	default y if BR2_SOFT_FLOAT
 	help
 	  Enable vorbis input/streaming support.
 	  Select this if you want to play back OGG files on hardfloat

And for hard float targets, we should use vorbis, but you make it available only on soft-float targets.

This seems weird.

Also, I am not sure why you are not just adding a depends on BR2_SOFT_FLOAT in one case, and a "depends on !BR2_SOFT_FLOAT" in the other case.

Thanks,

Thomas

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

PATCH 1/1 package/mpd: fix static build with tremor and vorbis

Dear Thomas,

Le sam. 1 juin 2019 ? 15:03, Thomas Petazzoni
<[email protected]> a ?crit :

Quoted 6 lines

Hello Fabrice,

On Sat, 1 Jun 2019 14:42:31 +0200
Fabrice Fontaine <[email protected]> wrote:

Quoted 12 lines

package/mpd/Config.in menuconfig BR2_PACKAGE_MPD · line 12

Quoted 9 lines
package/mpd/Config.in +0 -1
index d3844391a2..039c2402c2 100644
@@ -9,7 +9,6 @@ menuconfig BR2_PACKAGE_MPD
      depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # exception_ptr
      select BR2_PACKAGE_BOOST
      select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
-     select BR2_PACKAGE_MPD_TREMOR if !(BR2_PACKAGE_MPD_MAD || BR2_PACKAGE_MPD_MPG123 || BR2_PACKAGE_MPD_VORBIS || BR2_PACKAGE_MPD_WAVPACK || BR2_PACKAGE_MPD_FLAC || BR2_PACKAGE_MPD_MUSEPACK || BR2_PACKAGE_MPD_FFMPEG)

Why was this select here in the first place ? Does it build fine with no sub-option enabled ?

It builds fine without it. I don't know why this select was added.

Quoted 7 lines
Quoted 7 lines
package/mpd/Config.in +0 -0
      help
        MPD is a flexible, powerful, server-side application
        for playing music. Through plugins and libraries
@@ -132,18 +131,20 @@ config BR2_PACKAGE_MPD_OPUS
        Select this if you want to play back OPUS encoded files.
 
Quoted 13 lines

package/mpd/Config.in config BR2_PACKAGE_MPD_OPUS · line 141

Quoted 10 lines
package/mpd/Config.in +2 -1
 config BR2_PACKAGE_MPD_TREMOR
-     bool "tremor"
+     bool "tremor" if !BR2_SOFT_FLOAT
      select BR2_PACKAGE_LIBOGG
      select BR2_PACKAGE_TREMOR
+     default y if !BR2_SOFT_FLOAT
      help
        Enable vorbis input support.
        Select this if you want to play back OGG files on softfloat
        targets.

So for soft float targets, we should use tremor, but you make it depend on !BR2_SOFT_FLOAT.

Indeed, this is a mistake.

Quoted 11 lines

package/mpd/Config.in config BR2_PACKAGE_MPD_OPUS · line 150

Quoted 10 lines
package/mpd/Config.in +2 -1
 config BR2_PACKAGE_MPD_VORBIS
-     bool "vorbis"
+     bool "vorbis" if BR2_SOFT_FLOAT
      select BR2_PACKAGE_LIBOGG
      select BR2_PACKAGE_LIBVORBIS
+     default y if BR2_SOFT_FLOAT
      help
        Enable vorbis input/streaming support.
        Select this if you want to play back OGG files on hardfloat
Quoted 8 lines

And for hard float targets, we should use vorbis, but you make it available only on soft-float targets.

This seems weird.

Also, I am not sure why you are not just adding a depends on BR2_SOFT_FLOAT in one case, and a "depends on !BR2_SOFT_FLOAT" in the other case.

OK, I'll just add a depends on. I'll change the current behavior but I think this is acceptable.

Quoted 8 lines

Thanks,

Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

Best Regards,

Fabrice

#3 lore raw

PATCH 1/1 package/mpd: fix static build with tremor and vorbis

Hello,

Quoted 5 lines · On Sat, 1 Jun 2019 15:40:17 +0200 Fabrice Fontaine…
Quoted 4 lines
Quoted 1 line

- select BR2_PACKAGE_MPD_TREMOR if !(BR2_PACKAGE_MPD_MAD || BR2_PACKAGE_MPD_MPG123 || BR2_PACKAGE_MPD_VORBIS || BR2_PACKAGE_MPD_WAVPACK || BR2_PACKAGE_MPD_FLAC || BR2_PACKAGE_MPD_MUSEPACK || BR2_PACKAGE_MPD_FFMPEG)

Why was this select here in the first place ? Does it build fine with no sub-option enabled ?

It builds fine without it. I don't know why this select was added.

Should be mentioned in the commit log, and or perhaps even be part of a separate preparation patch.

The reason why this select was added is explained in commit d428dddf680b067c13ba9a08bfd502c7286cffe7:

commit d428dddf680b067c13ba9a08bfd502c7286cffe7

Author: Gustavo Zacarias <[email protected]>
Date:   Fri Feb 25 17:10:05 2011 -0300

mpd: default to tremor input plugin

MPD requires at least one input plugin to build. If there's none selected default to tremor (vorbis).

Perhaps this is no longer true today.

Quoted 5 lines
Quoted 3 lines

Also, I am not sure why you are not just adding a depends on BR2_SOFT_FLOAT in one case, and a "depends on !BR2_SOFT_FLOAT" in the other case.

OK, I'll just add a depends on. I'll change the current behavior but I think this is acceptable.

Your idea was to try to remain backward compatible with existing .config ? I'm not sure it's easy to achieve: we would want tremor to be enabled if vorbis was enabled but we're on a soft-float target. Except that you need to make vorbis depends on !BR2_SOFT_FLOAT, so it will become disabled anyway.

I'd say, let's keep things simple, and use simple dependencies. BTW, I'm not sure we should use BR2_SOFT_FLOAT. Perhaps, we should make the MPD_TREMOR and MPD_VORBIS options mutually exclusive ?

Thomas

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

PATCH 1/1 package/mpd: fix static build with tremor and vorbis

Le sam. 1 juin 2019 ? 15:47, Thomas Petazzoni
<[email protected]> a ?crit :

Quoted 6 lines

Hello,

On Sat, 1 Jun 2019 15:40:17 +0200
Fabrice Fontaine <[email protected]> wrote:

Quoted 8 lines
Quoted 5 lines
Quoted 4 lines
Quoted 1 line

- select BR2_PACKAGE_MPD_TREMOR if !(BR2_PACKAGE_MPD_MAD || BR2_PACKAGE_MPD_MPG123 || BR2_PACKAGE_MPD_VORBIS || BR2_PACKAGE_MPD_WAVPACK || BR2_PACKAGE_MPD_FLAC || BR2_PACKAGE_MPD_MUSEPACK || BR2_PACKAGE_MPD_FFMPEG)

Why was this select here in the first place ? Does it build fine with no sub-option enabled ?

It builds fine without it. I don't know why this select was added.

Should be mentioned in the commit log, and or perhaps even be part of a separate preparation patch.

OK, I'll retest it again and split the patch.

Quoted 18 lines

The reason why this select was added is explained in commit d428dddf680b067c13ba9a08bfd502c7286cffe7:

commit d428dddf680b067c13ba9a08bfd502c7286cffe7

Author: Gustavo Zacarias <[email protected]>
Date:   Fri Feb 25 17:10:05 2011 -0300

mpd: default to tremor input plugin

MPD requires at least one input plugin to build. If there's none selected default to tremor (vorbis).

Perhaps this is no longer true today.

Quoted 8 lines
Quoted 5 lines
Quoted 3 lines

Also, I am not sure why you are not just adding a depends on BR2_SOFT_FLOAT in one case, and a "depends on !BR2_SOFT_FLOAT" in the other case.

OK, I'll just add a depends on. I'll change the current behavior but I think this is acceptable.

Your idea was to try to remain backward compatible with existing .config ?

Yes, that was my idea.

Quoted 8 lines

I'm not sure it's easy to achieve: we would want
tremor to be enabled if vorbis was enabled but we're on a soft-float target. Except that you need to make vorbis depends on !BR2_SOFT_FLOAT, so it will become disabled anyway.

I'd say, let's keep things simple, and use simple dependencies. BTW, I'm not sure we should use BR2_SOFT_FLOAT. Perhaps, we should make the MPD_TREMOR and MPD_VORBIS options mutually exclusive ?

My original idea (before seeing J?rg proposal) was to add a depends on

!BR2_STATIC_LIBS || !BR2_PACKAGE_VORBIS for tremor option and
!BR2_STATIC_LIBS || !BR2_PACKAGE_TREMOR for vorbis

I think that !BR2_STATIC_LIBS is not useful as upstream decided to make both options exclusive so ok I'll just make them mutually exclusive.

Quoted 6 lines

Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

Best Regards,

Fabrice