mr/openwrt
2
0
Fork 1
Code Issues 7 Pull Requests Releases Wiki Activity

iputils: add missing includes, fix musl support

Browse Source 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 41958
This commit is contained in:
Felix Fietkau 2014-08-03 10:45:36 +00:00
parent 3e0247b95f
commit 49d00e95db
2 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
package/network/utils/iputils/Makefile
View File

@ -121,10 +121,14 @@ define Package/iputils-traceroute6/description
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

32
package/network/utils/iputils/patches/020-include_fixes.patch Normal file
View File

@ -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>