From 77216c368f3ae65c3a9fc504d28d3fadd46d6d8d Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Sun, 16 Oct 2022 02:04:59 +0200 Subject: Fix non-Linux builds Various tools are Linuxish and should thus only attempted to build on Linux only. Some features are also Linux-only. Also, libresolv is used on all GNU platforms, notably GNU/Hurd and GNU/kfreeBSD. Signed-off-by: Samuel Thibault Signed-off-by: Denys Vlasenko --- networking/arp.c | 1 + networking/arping.c | 1 + networking/brctl.c | 1 + networking/ifconfig.c | 1 + networking/ifplugd.c | 1 + networking/ip.c | 6 ++++++ networking/nameif.c | 1 + networking/route.c | 1 + networking/tc.c | 1 + networking/traceroute.c | 2 ++ networking/tunctl.c | 1 + networking/udhcp/Config.src | 3 +++ 12 files changed, 20 insertions(+) (limited to 'networking') diff --git a/networking/arp.c b/networking/arp.c index 16783ab95..6519f8156 100644 --- a/networking/arp.c +++ b/networking/arp.c @@ -15,6 +15,7 @@ //config:config ARP //config: bool "arp (10 kb)" //config: default y +//config: select PLATFORM_LINUX //config: help //config: Manipulate the system ARP cache. diff --git a/networking/arping.c b/networking/arping.c index 86f0221ed..fd0e1b276 100644 --- a/networking/arping.c +++ b/networking/arping.c @@ -8,6 +8,7 @@ //config:config ARPING //config: bool "arping (9 kb)" //config: default y +//config: select PLATFORM_LINUX //config: help //config: Ping hosts by ARP packets. diff --git a/networking/brctl.c b/networking/brctl.c index 956bd91f3..b353210d7 100644 --- a/networking/brctl.c +++ b/networking/brctl.c @@ -12,6 +12,7 @@ //config:config BRCTL //config: bool "brctl (4.7 kb)" //config: default y +//config: select PLATFORM_LINUX //config: help //config: Manage ethernet bridges. //config: Supports addbr/delbr and addif/delif. diff --git a/networking/ifconfig.c b/networking/ifconfig.c index 9ee232a66..4090959b8 100644 --- a/networking/ifconfig.c +++ b/networking/ifconfig.c @@ -27,6 +27,7 @@ //config:config IFCONFIG //config: bool "ifconfig (12 kb)" //config: default y +//config: select PLATFORM_LINUX //config: help //config: Ifconfig is used to configure the kernel-resident network interfaces. //config: diff --git a/networking/ifplugd.c b/networking/ifplugd.c index 0b55bf4e5..bc4303ef0 100644 --- a/networking/ifplugd.c +++ b/networking/ifplugd.c @@ -9,6 +9,7 @@ //config:config IFPLUGD //config: bool "ifplugd (10 kb)" //config: default y +//config: select PLATFORM_LINUX //config: help //config: Network interface plug detection daemon. diff --git a/networking/ip.c b/networking/ip.c index 7c3208699..23ee7d24b 100644 --- a/networking/ip.c +++ b/networking/ip.c @@ -11,6 +11,7 @@ //config:config IP //config: bool "ip (35 kb)" //config: default y +//config: select PLATFORM_LINUX //config: help //config: The "ip" applet is a TCP/IP interface configuration and routing //config: utility. @@ -21,6 +22,7 @@ //config:config IPADDR //config: bool "ipaddr (14 kb)" //config: default y +//config: select PLATFORM_LINUX //config: select FEATURE_IP_ADDRESS //config: help //config: Short form of "ip addr" @@ -28,6 +30,7 @@ //config:config IPLINK //config: bool "iplink (17 kb)" //config: default y +//config: select PLATFORM_LINUX //config: select FEATURE_IP_LINK //config: help //config: Short form of "ip link" @@ -35,6 +38,7 @@ //config:config IPROUTE //config: bool "iproute (15 kb)" //config: default y +//config: select PLATFORM_LINUX //config: select FEATURE_IP_ROUTE //config: help //config: Short form of "ip route" @@ -49,6 +53,7 @@ //config:config IPRULE //config: bool "iprule (10 kb)" //config: default y +//config: select PLATFORM_LINUX //config: select FEATURE_IP_RULE //config: help //config: Short form of "ip rule" @@ -56,6 +61,7 @@ //config:config IPNEIGH //config: bool "ipneigh (8.3 kb)" //config: default y +//config: select PLATFORM_LINUX //config: select FEATURE_IP_NEIGH //config: help //config: Short form of "ip neigh" diff --git a/networking/nameif.c b/networking/nameif.c index 66e042688..3ccd935b8 100644 --- a/networking/nameif.c +++ b/networking/nameif.c @@ -12,6 +12,7 @@ //config:config NAMEIF //config: bool "nameif (6.6 kb)" //config: default y +//config: select PLATFORM_LINUX //config: select FEATURE_SYSLOG //config: help //config: nameif is used to rename network interface by its MAC address. diff --git a/networking/route.c b/networking/route.c index 26146f8e9..616572814 100644 --- a/networking/route.c +++ b/networking/route.c @@ -27,6 +27,7 @@ //config:config ROUTE //config: bool "route (8.7 kb)" //config: default y +//config: select PLATFORM_LINUX //config: help //config: Route displays or manipulates the kernel's IP routing tables. diff --git a/networking/tc.c b/networking/tc.c index 43187f7ee..1f4bcce2b 100644 --- a/networking/tc.c +++ b/networking/tc.c @@ -9,6 +9,7 @@ //config:config TC //config: bool "tc (8.3 kb)" //config: default y +//config: select PLATFORM_LINUX //config: help //config: Show / manipulate traffic control settings //config: diff --git a/networking/traceroute.c b/networking/traceroute.c index 4bbe1ab8e..2ba990fd0 100644 --- a/networking/traceroute.c +++ b/networking/traceroute.c @@ -963,8 +963,10 @@ traceroute_init(int op, char **argv) if (af == AF_INET) { xmove_fd(xsocket(AF_INET, SOCK_RAW, IPPROTO_ICMP), rcvsock); #if ENABLE_FEATURE_TRACEROUTE_VERBOSE +# ifdef IP_PKTINFO /* want recvmsg to report target local address (for -v) */ setsockopt_1(rcvsock, IPPROTO_IP, IP_PKTINFO); +# endif #endif } #if ENABLE_TRACEROUTE6 diff --git a/networking/tunctl.c b/networking/tunctl.c index 97e6917aa..59cae331c 100644 --- a/networking/tunctl.c +++ b/networking/tunctl.c @@ -12,6 +12,7 @@ //config:config TUNCTL //config: bool "tunctl (6.2 kb)" //config: default y +//config: select PLATFORM_LINUX //config: help //config: tunctl creates or deletes tun devices. //config: diff --git a/networking/udhcp/Config.src b/networking/udhcp/Config.src index 8c8c11c26..23e2b40d8 100644 --- a/networking/udhcp/Config.src +++ b/networking/udhcp/Config.src @@ -6,6 +6,7 @@ config UDHCPD bool "udhcpd (21 kb)" default y + select PLATFORM_LINUX help udhcpd is a DHCP server geared primarily toward embedded systems, while striving to be fully functional and RFC compliant. @@ -53,6 +54,7 @@ config DUMPLEASES config DHCPRELAY bool "dhcprelay (5.2 kb)" default y + select PLATFORM_LINUX help dhcprelay listens for DHCP requests on one or more interfaces and forwards these requests to a different interface or DHCP @@ -61,6 +63,7 @@ config DHCPRELAY config UDHCPC bool "udhcpc (24 kb)" default y + select PLATFORM_LINUX help udhcpc is a DHCP client geared primarily toward embedded systems, while striving to be fully functional and RFC compliant. -- cgit v1.2.1