Author: blogic Date: 2014-08-03 13:15:56 +0200 (Sun, 03 Aug 2014) New Revision: 41980
Added: branches/barrier_breaker/package/network/utils/iputils/patches/020-include_fixes.patch Modified: branches/barrier_breaker/package/network/utils/iputils/Makefile Log: iputils: add missing includes, fix musl support Signed-off-by: Felix Fietkau <[email protected]> Backport of r41958 Modified: branches/barrier_breaker/package/network/utils/iputils/Makefile =================================================================== --- branches/barrier_breaker/package/network/utils/iputils/Makefile 2014-08-03 11:15:54 UTC (rev 41979) +++ branches/barrier_breaker/package/network/utils/iputils/Makefile 2014-08-03 11:15:56 UTC (rev 41980) @@ -121,10 +121,14 @@ Traces path to a network host (IPv6). endef +ifdef CONFIG_USE_MUSL + TARGET_CFLAGS += -D__UCLIBC__ +endif + MAKE_FLAGS += \ CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS)" \ CONFIG_IPV6="$(CONFIG_IPV6)" \ - CONFIG_USE_UCLIBC="$(CONFIG_USE_UCLIBC)" \ + CONFIG_USE_UCLIBC="$(CONFIG_USE_UCLIBC)$(CONFIG_USE_MUSL)" \ define Package/iputils-arping/install $(INSTALL_DIR) $(1)/usr/bin Added: branches/barrier_breaker/package/network/utils/iputils/patches/020-include_fixes.patch =================================================================== --- branches/barrier_breaker/package/network/utils/iputils/patches/020-include_fixes.patch (rev 0) +++ branches/barrier_breaker/package/network/utils/iputils/patches/020-include_fixes.patch 2014-08-03 11:15:56 UTC (rev 41980) @@ -0,0 +1,32 @@ +--- a/ping_common.h ++++ b/ping_common.h +@@ -2,6 +2,7 @@ + #include <stdlib.h> + #include <unistd.h> + #include <time.h> ++#include <sys/types.h> + #include <sys/param.h> + #include <sys/socket.h> + #include <linux/sockios.h> +@@ -24,6 +25,10 @@ + + #include "SNAPSHOT.h" + ++#ifndef HZ ++#define HZ 100 ++#endif ++ + #define DEFDATALEN (64 - 8) /* default data length */ + + #define MAXWAIT 10 /* max seconds to wait for response */ +--- a/clockdiff.c ++++ b/clockdiff.c +@@ -13,8 +13,6 @@ + #include <netinet/in.h> + #include <netinet/ip.h> + #include <netinet/ip_icmp.h> +-#define TSPTYPES +-#include <protocols/timed.h> + #include <fcntl.h> + #include <netdb.h> + #include <arpa/inet.h> _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
