fix trivial compile errors found by randomconfig run

diff --git a/include/applets.h b/include/applets.h
index a7aee3a1dab0e1ce60f0c2c120556782f6856c69..99e6aceb5211823d9f2a804db6e13ff1c50a83b2 100644 (file)
--- a/include/applets.h
+++ b/include/applets.h
@@ -176,7 +176,13 @@ USE_INETD(APPLET(inetd, _BB_DIR_USR_SBIN, _BB_SUID_NEVER))
 USE_INIT(APPLET(init, _BB_DIR_SBIN, _BB_SUID_NEVER))
 USE_INSMOD(APPLET(insmod, _BB_DIR_SBIN, _BB_SUID_NEVER))
 USE_INSTALL(APPLET(install, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
+#if ENABLE_FEATURE_IP_ADDRESS \
+ || ENABLE_FEATURE_IP_ROUTE \
+ || ENABLE_FEATURE_IP_LINK \
+ || ENABLE_FEATURE_IP_TUNNEL \
+ || ENABLE_FEATURE_IP_RULE
 USE_IP(APPLET(ip, _BB_DIR_BIN, _BB_SUID_NEVER))
+#endif
 USE_IPADDR(APPLET(ipaddr, _BB_DIR_BIN, _BB_SUID_NEVER))
 USE_IPCALC(APPLET(ipcalc, _BB_DIR_BIN, _BB_SUID_NEVER))
 USE_IPCRM(APPLET(ipcrm, _BB_DIR_USR_BIN, _BB_SUID_ALWAYS))

diff --git a/libbb/Kbuild b/libbb/Kbuild
index 5cc8d1428b8a27bbd778fb56b4a6a598fee491b5..e562f32224a59d288fc1de794365c7c1d39e614e 100644 (file)
--- a/libbb/Kbuild
+++ b/libbb/Kbuild
@@ -120,6 +120,7 @@ lib-$(CONFIG_SELINUX) += selinux_common.o
 lib-$(CONFIG_AWK) += xregcomp.o
 lib-$(CONFIG_SED) += xregcomp.o
 lib-$(CONFIG_GREP) += xregcomp.o
+lib-$(CONFIG_EXPR) += xregcomp.o
 lib-$(CONFIG_MDEV) += xregcomp.o
 lib-$(CONFIG_LESS) += xregcomp.o
 lib-$(CONFIG_DEVFSD) += xregcomp.o

diff --git a/networking/ip.c b/networking/ip.c
index dd1d863da28d3b81308ffe1e0081f36831ea3f41..c7816c8cc88f0b9588d919127a85eeb1a2eb3f5c 100644 (file)
--- a/networking/ip.c
+++ b/networking/ip.c
@@ -18,6 +18,12 @@
 #include "libiproute/utils.h"
 #include "libiproute/ip_common.h"
 
+#if ENABLE_FEATURE_IP_ADDRESS \
+ || ENABLE_FEATURE_IP_ROUTE \
+ || ENABLE_FEATURE_IP_LINK \
+ || ENABLE_FEATURE_IP_TUNNEL \
+ || ENABLE_FEATURE_IP_RULE
+
 static int ATTRIBUTE_NORETURN ip_print_help(int ATTRIBUTE_UNUSED ac, char ATTRIBUTE_UNUSED **av)
 {
        bb_show_usage();
@@ -121,3 +127,5 @@ int ip_main(int argc, char **argv)
        }
        return (ip_func(argc, argv));
 }
+
+#endif /* any of ENABLE_FEATURE_IP_xxx is 1 */