From f6cf18303119f5c481a135abaee67867b03d8d54 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Wed, 3 Jan 2024 10:26:19 -0700 Subject: [PATCH] package/fcft: disable uClibc support fcft needs ISO C threads, aka C11 threads, which are different from POSIX threads, and are available in both glibc and musl, but not in uClibc-ng. Add a dependency on glibc or musl, and since both imply threads, drop the dependency on threads. Propagate the new dependency to the foot package, and adapt the comments accordingly. Fixes: http://autobuild.buildroot.net/results/1b2dda32a90d7db8117eede09f46d44cffe60993 http://autobuild.buildroot.net/results/5f03bb5c0c107a2b908be974421ae0a032d4dd89 http://autobuild.buildroot.net/results/31a1f022414a8a1888cac4a5cd1761257d0f2196 http://autobuild.buildroot.net/results/4522781e0448b325b54e93bbfb20f8295ea7061d Signed-off-by: Adam Duskett [yann.morin.1998@free.fr; - drop the dependencies on threads, implied by glibc or musl - fix dependencies on comments - reword the commit log to refer to ICO C threads ] Signed-off-by: Yann E. MORIN --- package/fcft/Config.in | 6 +++--- package/foot/Config.in | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/package/fcft/Config.in b/package/fcft/Config.in index b65515a3f1..5393b95db3 100644 --- a/package/fcft/Config.in +++ b/package/fcft/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_FCFT bool "fcft" - depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL # C11 threads select BR2_PACKAGE_FONTCONFIG select BR2_PACKAGE_FREETYPE select BR2_PACKAGE_PIXMAN @@ -48,5 +48,5 @@ config BR2_PACKAGE_FCFT_SVG_SUPPORT endif # BR2_PACKAGE_FCFT -comment "fcft needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS +comment "fcft needs a glibc or musl toolchain" + depends on !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) diff --git a/package/foot/Config.in b/package/foot/Config.in index 24b3f78821..b0ec2e3926 100644 --- a/package/foot/Config.in +++ b/package/foot/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_FOOT bool "foot" + depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL # fcft depends on !BR2_STATIC_LIBS # wayland - depends on BR2_TOOLCHAIN_HAS_THREADS # fcft, wayland select BR2_PACKAGE_FCFT select BR2_PACKAGE_FONTCONFIG select BR2_PACKAGE_FREETYPE @@ -32,5 +32,6 @@ config BR2_PACKAGE_FOOT_THEMES endif # BR2_PACKAGE_FOOT -comment "foot needs a toolchain w/ dynamic library, threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS +comment "foot needs a glibc or musl toolchain w/ dynamic library" + depends on !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) || \ + BR2_STATIC_LIBS