svn commit: trunk/busybox: include libbb networking

vda at busybox.net vda at busybox.net
Thu May 17 05:58:31 PDT 2007


Author: vda
Date: 2007-05-17 05:58:30 -0700 (Thu, 17 May 2007)
New Revision: 18639

Log:
fix trivial compile errors found by randomconfig run


Modified:
   trunk/busybox/include/applets.h
   trunk/busybox/libbb/Kbuild
   trunk/busybox/networking/ip.c


Changeset:
Modified: trunk/busybox/include/applets.h
===================================================================
--- trunk/busybox/include/applets.h	2007-05-16 22:25:35 UTC (rev 18638)
+++ trunk/busybox/include/applets.h	2007-05-17 12:58:30 UTC (rev 18639)
@@ -176,7 +176,13 @@
 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))

Modified: trunk/busybox/libbb/Kbuild
===================================================================
--- trunk/busybox/libbb/Kbuild	2007-05-16 22:25:35 UTC (rev 18638)
+++ trunk/busybox/libbb/Kbuild	2007-05-17 12:58:30 UTC (rev 18639)
@@ -120,6 +120,7 @@
 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

Modified: trunk/busybox/networking/ip.c
===================================================================
--- trunk/busybox/networking/ip.c	2007-05-16 22:25:35 UTC (rev 18638)
+++ trunk/busybox/networking/ip.c	2007-05-17 12:58:30 UTC (rev 18639)
@@ -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 @@
 	}
 	return (ip_func(argc, argv));
 }
+
+#endif /* any of ENABLE_FEATURE_IP_xxx is 1 */



More information about the busybox-cvs mailing list