mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-10-21 16:32:45 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/mpg123: remove MMU dependency

Browse Source 
Buildroot commit f0862592b3 added the
dependency to BR2_USE_MMU in 2014.

Upstream made fork() optional in 2022:
91f75fc026

This change reveals a previously hidden build error with the toolchain
bootlin-armv7m-uclibc:

src/libmpg123/synth_arm_accurate.S: Assembler messages:
src/libmpg123/synth_arm_accurate.S:22: Error: selected processor does
 not support ARM opcodes
src/libmpg123/synth_arm_accurate.S:31: Error: attempt to use an ARM
 instruction on a Thumb-only processor --
 `stmfd sp!,{r4,r5,r6,r7,r8,r9,r10,r11,lr}'
src/libmpg123/synth_arm_accurate.S:33: Error: attempt to use an ARM
 instruction on a Thumb-only processor -- `add r0,r0,#64'
[...]

To fix the problem we limit ARM code to BR2_ARM_CPU_HAS_ARM.

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit fca0899dd6)
Signed-off-by: Raphaël Mélotte <raphael.melotte@mind.be>
This commit is contained in:
Bernd Kuhls
2026-09-26 15:00:06 +02:00
committed by Raphaël Mélotte
parent 98ef053c24
commit 789bf2f21f
3 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
package/mpg123/Config.in
View File

@@ -1,6 +1,5 @@
config BR2_PACKAGE_MPG123
bool "mpg123"
depends on BR2_USE_MMU # fork - in the application
help
Fast, free and portable MPEG audio player for Unix. It
supports MPEG 1.0/2.0 layers 1, 2 and 3.

2
package/mpg123/mpg123.mk
View File

@@ -26,7 +26,7 @@ ifeq ($(BR2_aarch64),y)
MPG123_CPU = aarch64
endif
ifeq ($(BR2_arm),y)
ifeq ($(BR2_arm)$(BR2_ARM_CPU_HAS_ARM),yy)
ifeq ($(or $(BR2_ARM_CPU_HAS_NEON),$(BR2_ARM_CPU_HAS_VFPV2)),y)
MPG123_CPU = arm_fpu
else

2
package/squeezelite/Config.in
View File

@@ -2,7 +2,6 @@ config BR2_PACKAGE_SQUEEZELITE
bool "squeezelite"
depends on BR2_USE_WCHAR # flac
depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
depends on BR2_USE_MMU # mpg123
depends on !BR2_STATIC_LIBS # dlopen
select BR2_PACKAGE_ALSA_LIB
select BR2_PACKAGE_ALSA_LIB_MIXER
@@ -44,6 +43,5 @@ config BR2_PACKAGE_SQUEEZELITE_VISEXPORT
endif
comment "squeezelite needs a toolchain w/ wchar, NPTL, dynamic library"
depends on BR2_USE_MMU
depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS_NPTL \
|| BR2_STATIC_LIBS