From 789bf2f21fb281bc946775c5d8ab51407f49809b Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 26 Sep 2026 15:00:06 +0200 Subject: [PATCH] package/mpg123: remove MMU dependency MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Buildroot commit f0862592b3caf5bc9cd347fd29634673cfbbabd7 added the dependency to BR2_USE_MMU in 2014. Upstream made fork() optional in 2022: https://github.com/madebr/mpg123/commit/91f75fc026e37d88d25229b81c58bcf8d6d2a8eb 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 Signed-off-by: Thomas Petazzoni (cherry picked from commit fca0899dd6cbeb9e6c7442d4b53513f7a29e98f4) Signed-off-by: Raphaël Mélotte --- package/mpg123/Config.in | 1 - package/mpg123/mpg123.mk | 2 +- package/squeezelite/Config.in | 2 -- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/package/mpg123/Config.in b/package/mpg123/Config.in index 73ca1c740c..8cbc3a4758 100644 --- a/package/mpg123/Config.in +++ b/package/mpg123/Config.in @@ -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. diff --git a/package/mpg123/mpg123.mk b/package/mpg123/mpg123.mk index 17445395ae..e6c90ce685 100644 --- a/package/mpg123/mpg123.mk +++ b/package/mpg123/mpg123.mk @@ -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 diff --git a/package/squeezelite/Config.in b/package/squeezelite/Config.in index a034759143..0bdc43ce6c 100644 --- a/package/squeezelite/Config.in +++ b/package/squeezelite/Config.in @@ -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