From d2c997e6b073ee244855e3239bf72e64df473f0e Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 16 Jul 2016 18:08:18 +0200 Subject: [PATCH] package/pppd: disable for musl toolchains For the same reason as for ipsec-tools [1], disable pppd for musl toolchains. It also include which is not provided by musl [2]. This fixes a compilation error with musl libc because of undeclared __P and missing sys/cdefs.h include. Propagate the dependency to network-manager and rp-pppoe packages. [1] 33499484e457018203023cdfdd5286478f2ae381 [2] http://wiki.musl-libc.org/wiki/FAQ#Q:_I.27m_trying_to_compile_something_against_musl_and_I_get_error_messages_about_sys.2Fcdefs.h Signed-off-by: Romain Naour [Thomas: add Config.in comment in network-manager.] Signed-off-by: Thomas Petazzoni --- package/network-manager/Config.in | 5 +++++ package/pppd/Config.in | 5 +++-- package/rp-pppoe/Config.in | 5 +++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/package/network-manager/Config.in b/package/network-manager/Config.in index 0636415234..c9dabfdd42 100644 --- a/package/network-manager/Config.in +++ b/package/network-manager/Config.in @@ -47,9 +47,14 @@ config BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER config BR2_PACKAGE_NETWORK_MANAGER_PPPD bool "pppd support" + depends on !BR2_TOOLCHAIN_USES_MUSL # pppd select BR2_PACKAGE_PPPD help This option enables support for PPPD daemon + +comment "pppd support needs a glibc or uClibc toolchain" + depends on BR2_TOOLCHAIN_USES_MUSL + endif comment "NetworkManager needs udev /dev management and a glibc toolchain w/ headers >= 3.7" diff --git a/package/pppd/Config.in b/package/pppd/Config.in index b77d7b03da..b56b623459 100644 --- a/package/pppd/Config.in +++ b/package/pppd/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_PPPD bool "pppd" depends on !BR2_STATIC_LIBS + depends on !BR2_TOOLCHAIN_USES_MUSL # Use __P() macro all over the tree depends on BR2_USE_MMU help An implementation of the Point-to-point protocol. @@ -24,6 +25,6 @@ config BR2_PACKAGE_PPPD_RADIUS endif -comment "pppd needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS +comment "pppd needs a uClibc or glibc toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS || BR2_TOOLCHAIN_USES_MUSL depends on BR2_USE_MMU diff --git a/package/rp-pppoe/Config.in b/package/rp-pppoe/Config.in index 7f6afe27ea..a41de33332 100644 --- a/package/rp-pppoe/Config.in +++ b/package/rp-pppoe/Config.in @@ -1,10 +1,11 @@ -comment "rp-pppoe needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS +comment "rp-pppoe needs a uClibc or glibc toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS || BR2_TOOLCHAIN_USES_MUSL depends on BR2_USE_MMU config BR2_PACKAGE_RP_PPPOE bool "rp-pppoe" depends on !BR2_STATIC_LIBS + depends on !BR2_TOOLCHAIN_USES_MUSL # pppd depends on BR2_USE_MMU # fork() select BR2_PACKAGE_PPPD help -- 2.30.2