From 6ab6731fa24fc9a51fd55b111c8eb6afd1feee37 Mon Sep 17 00:00:00 2001 From: "Fiona Klute (WIWA)" Date: Mon, 8 Jul 2024 22:21:17 +0200 Subject: [PATCH] package/network-manager: allow building with musl NetworkManager officially supports building with musl since version 1.30, so the restriction to glibc toolchain is no longer necessary. [1] https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/blob/4f7c04eaf94849d0455e97ba9bcfdd0b84e6459d/NEWS#L615 Signed-off-by: Fiona Klute (WIWA) Signed-off-by: Thomas Petazzoni (cherry picked from commit 8df68d2bb454ff22a32c598e343e63cd7e3c02f6) Signed-off-by: Peter Korsgaard --- package/network-manager/Config.in | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/package/network-manager/Config.in b/package/network-manager/Config.in index 57d7543131..1d9a02c1d3 100644 --- a/package/network-manager/Config.in +++ b/package/network-manager/Config.in @@ -5,7 +5,7 @@ config BR2_PACKAGE_NETWORK_MANAGER depends on BR2_PACKAGE_HAS_UDEV depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_6 - depends on BR2_TOOLCHAIN_USES_GLIBC # CLOCK_BOOTTIME, IPTOS_CLASS_* + depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 depends on BR2_USE_WCHAR # libglib2 select BR2_PACKAGE_DBUS @@ -59,10 +59,11 @@ config BR2_PACKAGE_NETWORK_MANAGER_OVS This option enables support for OpenVSwitch endif -comment "NetworkManager needs udev /dev management and a glibc toolchain w/ headers >= 4.6, dynamic library, wchar, threads, gcc >= 4.9" +comment "NetworkManager needs udev /dev management and a glibc or musl toolchain w/ headers >= 4.6, dynamic library, wchar, threads, gcc >= 4.9" depends on BR2_USE_MMU depends on !BR2_PACKAGE_HAS_UDEV || \ !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_6 || \ - !BR2_TOOLCHAIN_USES_GLIBC || BR2_STATIC_LIBS || \ + !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) || \ + BR2_STATIC_LIBS || \ !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9