diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2014-08-03 10:45:36 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2014-08-03 10:45:36 +0000 |
| commit | 49d00e95dbbf5413098527755ac42f4f15132220 (patch) | |
| tree | dade0343b6a89d3dfe9a6ee7224c2ec1e868c935 | |
| parent | 3e0247b95fa2aea8f09b025d4364b56a5f92d955 (diff) | |
| download | upstream-49d00e95dbbf5413098527755ac42f4f15132220.tar.gz upstream-49d00e95dbbf5413098527755ac42f4f15132220.tar.bz2 upstream-49d00e95dbbf5413098527755ac42f4f15132220.zip | |
iputils: add missing includes, fix musl support
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 41958
| -rw-r--r-- | package/network/utils/iputils/Makefile | 6 | ||||
| -rw-r--r-- | package/network/utils/iputils/patches/020-include_fixes.patch | 32 |
2 files changed, 37 insertions, 1 deletions
diff --git a/package/network/utils/iputils/Makefile b/package/network/utils/iputils/Makefile index eeb6deb900..19061ca77a 100644 --- a/package/network/utils/iputils/Makefile +++ b/package/network/utils/iputils/Makefile @@ -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 diff --git a/package/network/utils/iputils/patches/020-include_fixes.patch b/package/network/utils/iputils/patches/020-include_fixes.patch new file mode 100644 index 0000000000..0c977498b1 --- /dev/null +++ b/package/network/utils/iputils/patches/020-include_fixes.patch @@ -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> |