From 678c94a1a60692135a5aba0996ebd5377f7625e5 Mon Sep 17 00:00:00 2001 From: "Alexandros C. Couloumbis" Date: Wed, 7 Jul 2010 09:59:54 +0000 Subject: [PATCH] net/iputils: update to iputils-20100418 SVN-Revision: 22083 --- net/iputils/Makefile | 7 ++++--- net/iputils/patches/002-fix-ipv6.patch | 9 --------- net/iputils/patches/003-fix-makefile.patch | 16 ++++++++++++++++ 3 files changed, 20 insertions(+), 12 deletions(-) create mode 100644 net/iputils/patches/003-fix-makefile.patch diff --git a/net/iputils/Makefile b/net/iputils/Makefile index 40c4903a6..736144ae2 100644 --- a/net/iputils/Makefile +++ b/net/iputils/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=iputils -PKG_VERSION:=20071127 +PKG_VERSION:=20100418 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-s$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://www.skbuff.net/iputils -PKG_MD5SUM:=12245e9927d60ff5cf4a99d265bcb7d3 +PKG_MD5SUM:=df6b0062118cdc5c62e3c810f831e976 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-s$(PKG_VERSION) @@ -26,6 +26,7 @@ define Package/iputils-arping CATEGORY:=Network TITLE:=iputils - arping URL:=http://www.skbuff.net/iputils + DEPENDS:= +sysfsutils endef define Package/iputils-arping/description @@ -121,7 +122,7 @@ define Package/iputils-traceroute6/description endef MAKE_FLAGS += \ - CFLAGS="$(TARGET_CFLAGS)" + CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include -L$(STAGING_DIR)/usr/lib" define Package/iputils-arping/install $(INSTALL_DIR) $(1)/usr/bin diff --git a/net/iputils/patches/002-fix-ipv6.patch b/net/iputils/patches/002-fix-ipv6.patch index 09617ca56..f549d71db 100644 --- a/net/iputils/patches/002-fix-ipv6.patch +++ b/net/iputils/patches/002-fix-ipv6.patch @@ -12,12 +12,3 @@ LASTTAG:=`git-describe HEAD | sed -e 's/-.*//'` TAG:=`date +s%Y%m%d` -@@ -29,7 +32,7 @@ all: $(TARGETS) - tftpd: tftpd.o tftpsubs.o - ping: ping.o ping_common.o - ping6: ping6.o ping_common.o --ping.o ping6.o ping_common.o: ping_common.h -+ping.o ping_common.o: ping_common.h - tftpd.o tftpsubs.o: tftp.h - - rdisc_srv: rdisc_srv.o diff --git a/net/iputils/patches/003-fix-makefile.patch b/net/iputils/patches/003-fix-makefile.patch new file mode 100644 index 000000000..f2bc17a62 --- /dev/null +++ b/net/iputils/patches/003-fix-makefile.patch @@ -0,0 +1,16 @@ +--- a/Makefile ++++ b/Makefile +@@ -30,9 +30,11 @@ all: $(TARGETS) + + + tftpd: tftpd.o tftpsubs.o +-arping: arping.o -lsysfs ++arping: arping.o ++ $(CC) $(CFLAGS) -o $@ arping.o -lsysfs + ping: ping.o ping_common.o +-ping6: ping6.o ping_common.o -lresolv -lcrypto ++ping6: ping6.o ping_common.o ++ $(CC) $(CFLAGS) -o $@ ping6.o ping_common.o -lresolv -lcrypto + ping.o ping6.o ping_common.o: ping_common.h + tftpd.o tftpsubs.o: tftp.h + -- 2.30.2