]> rtime.felk.cvut.cz Git - coffee/buildroot.git/commitdiff
package/pppd: disable for musl toolchains
authorRomain Naour <romain.naour@gmail.com>
Sat, 16 Jul 2016 16:08:18 +0000 (18:08 +0200)
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Sat, 16 Jul 2016 18:22:08 +0000 (20:22 +0200)
For the same reason as for ipsec-tools [1], disable pppd for musl
toolchains.
It also include <sys/cdefs.h> 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 <romain.naour@gmail.com>
[Thomas: add Config.in comment in network-manager.]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
package/network-manager/Config.in
package/pppd/Config.in
package/rp-pppoe/Config.in

index 06364152347c7d9aa00855b117debb27d059f495..c9dabfdd42f4d0af7ddf2d84b5913b7b341172f3 100644 (file)
@@ -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"
index b77d7b03dae4eb57a3cce708665b42835fb7babe..b56b623459cc91efee77ddc8774ca4d162fd208f 100644 (file)
@@ -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
index 7f6afe27ea7bfbc9eb50745e73aef8c87fdf1baf..a41de33332e99213618620275675daf69e0e3c62 100644 (file)
@@ -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