diff mbox series

[1/1] package/qemu: reenable Qemu user-land emulation for musl toolchains

Message ID 20230112075509.2200-1-caseorum@gmail.com
State New
Headers show
Series [1/1] package/qemu: reenable Qemu user-land emulation for musl toolchains | expand

Commit Message

Joseph Burt Jan. 12, 2023, 7:55 a.m. UTC
Compatible "struct sigevent" added upstream in musl 1.2.2 [1].

[1] https://git.musl-libc.org/cgit/musl/commit/?id=7c71792e87691451f2a6b76348e83ad1889f1dcb

Signed-off-by: Joseph Burt <caseorum@gmail.com>
---
 package/qemu/Config.in | 5 -----
 1 file changed, 5 deletions(-)

Comments

Romain Naour Feb. 6, 2024, 4:26 p.m. UTC | #1
Hello,

Le 12/01/2023 à 08:55, Joseph Burt a écrit :
> Compatible "struct sigevent" added upstream in musl 1.2.2 [1].
> 
> [1] https://git.musl-libc.org/cgit/musl/commit/?id=7c71792e87691451f2a6b76348e83ad1889f1dcb

Ok but it would fail with existing (old) prebuilt musl toolchains.
Is musl 1.2.2 old enough?

Best regards,
Romain


> 
> Signed-off-by: Joseph Burt <caseorum@gmail.com>
> ---
>  package/qemu/Config.in | 5 -----
>  1 file changed, 5 deletions(-)
> 
> diff --git a/package/qemu/Config.in b/package/qemu/Config.in
> index 154b98a541..d818bebb34 100644
> --- a/package/qemu/Config.in
> +++ b/package/qemu/Config.in
> @@ -102,16 +102,11 @@ comment "systems emulation needs a toolchain w/ dynamic library"
>  
>  config BR2_PACKAGE_QEMU_LINUX_USER
>  	bool "Enable Linux user-land emulation"
> -	# Incompatible "struct sigevent" definition on musl
> -	depends on !BR2_TOOLCHAIN_USES_MUSL
>  	help
>  	  Say 'y' to build Linux user-land emulators.
>  
>  # Note: bsd-user can not be build on Linux
>  
> -comment "Linux user-land emulation needs a glibc or uClibc toolchain"
> -	depends on BR2_TOOLCHAIN_USES_MUSL
> -
>  config BR2_PACKAGE_QEMU_CHOOSE_TARGETS
>  	bool "Select individual emulator targets"
>  	depends on BR2_PACKAGE_QEMU_SYSTEM || BR2_PACKAGE_QEMU_LINUX_USER
Joseph Burt Feb. 6, 2024, 7:46 p.m. UTC | #2
Hello Romain,

On Tue, Feb 6, 2024 at 4:26 PM Romain Naour <romain.naour@smile.fr> wrote:
> Ok but it would fail with existing (old) prebuilt musl toolchains.
> Is musl 1.2.2 old enough?

Musl 1.2.2 is three years old, and anyone building qemu-user pre musl
1.2.2 has patched qemu and buildroot to do so.
This fails if someone is building qemu-user for the first time on the
latest buildroot with a very old musl toolchain.
I hope that is unlikely, but I don't know.

Best wishes,
Joseph
diff mbox series

Patch

diff --git a/package/qemu/Config.in b/package/qemu/Config.in
index 154b98a541..d818bebb34 100644
--- a/package/qemu/Config.in
+++ b/package/qemu/Config.in
@@ -102,16 +102,11 @@  comment "systems emulation needs a toolchain w/ dynamic library"
 
 config BR2_PACKAGE_QEMU_LINUX_USER
 	bool "Enable Linux user-land emulation"
-	# Incompatible "struct sigevent" definition on musl
-	depends on !BR2_TOOLCHAIN_USES_MUSL
 	help
 	  Say 'y' to build Linux user-land emulators.
 
 # Note: bsd-user can not be build on Linux
 
-comment "Linux user-land emulation needs a glibc or uClibc toolchain"
-	depends on BR2_TOOLCHAIN_USES_MUSL
-
 config BR2_PACKAGE_QEMU_CHOOSE_TARGETS
 	bool "Select individual emulator targets"
 	depends on BR2_PACKAGE_QEMU_SYSTEM || BR2_PACKAGE_QEMU_LINUX_USER