From cd723b79f4263cd2912a5451c10be5c888d63d3b Mon Sep 17 00:00:00 2001
From: "Alexandros C. Couloumbis" <alex@ozo.com>
Date: Thu, 1 Jul 2010 08:53:07 +0000
Subject: [PATCH] net/iputils: fix ipv6 compile errors (thanks florian)

SVN-Revision: 22011
---
 net/iputils/Makefile                          | 11 ++++++---
 .../{iputils.patch => 001-iputils.patch}      |  0
 net/iputils/patches/002-fix-ipv6.patch        | 23 +++++++++++++++++++
 3 files changed, 31 insertions(+), 3 deletions(-)
 rename net/iputils/patches/{iputils.patch => 001-iputils.patch} (100%)
 create mode 100644 net/iputils/patches/002-fix-ipv6.patch

diff --git a/net/iputils/Makefile b/net/iputils/Makefile
index 95a7da124..40c4903a6 100644
--- a/net/iputils/Makefile
+++ b/net/iputils/Makefile
@@ -62,6 +62,7 @@ define Package/iputils-ping6
   CATEGORY:=Network
   TITLE:=iputils - ping6
   URL:=http://www.skbuff.net/iputils
+  DEPENDS += @IPV6
 endef
 
 define Package/iputils-ping6/description
@@ -98,6 +99,7 @@ define Package/iputils-tracepath6
   CATEGORY:=Network
   TITLE:=iputils - tracepath6
   URL:=http://www.skbuff.net/iputils
+  DEPENDS += @IPV6
 endef
 
 define Package/iputils-tracepath6/description
@@ -110,6 +112,7 @@ define Package/iputils-traceroute6
   CATEGORY:=Network
   TITLE:=iputils - traceroute6
   URL:=http://www.skbuff.net/iputils
+  DEPENDS += @IPV6
 endef
 
 define Package/iputils-traceroute6/description
@@ -163,8 +166,10 @@ endef
 $(eval $(call BuildPackage,iputils-arping))
 $(eval $(call BuildPackage,iputils-clockdiff))
 $(eval $(call BuildPackage,iputils-ping))
-$(eval $(call BuildPackage,iputils-ping6))
 $(eval $(call BuildPackage,iputils-tftpd))
 $(eval $(call BuildPackage,iputils-tracepath))
-$(eval $(call BuildPackage,iputils-tracepath6))
-$(eval $(call BuildPackage,iputils-traceroute6))
+ifeq ($(CONFIG_IPV6),y)
+	$(eval $(call BuildPackage,iputils-ping6))
+	$(eval $(call BuildPackage,iputils-tracepath6))
+	$(eval $(call BuildPackage,iputils-traceroute6))
+endif
diff --git a/net/iputils/patches/iputils.patch b/net/iputils/patches/001-iputils.patch
similarity index 100%
rename from net/iputils/patches/iputils.patch
rename to net/iputils/patches/001-iputils.patch
diff --git a/net/iputils/patches/002-fix-ipv6.patch b/net/iputils/patches/002-fix-ipv6.patch
new file mode 100644
index 000000000..09617ca56
--- /dev/null
+++ b/net/iputils/patches/002-fix-ipv6.patch
@@ -0,0 +1,23 @@
+--- a/Makefile
++++ b/Makefile
+@@ -18,7 +18,10 @@ CFLAGS=$(CCOPT) $(GLIBCFIX) $(DEFINES)
+ 
+ IPV4_TARGETS=tracepath ping clockdiff arping tftpd
+ IPV6_TARGETS=tracepath6 traceroute6 ping6
+-TARGETS=$(IPV4_TARGETS) $(IPV6_TARGETS)
++TARGETS=$(IPV4_TARGETS)
++ifeq ($(CONFIG_IPV6),y)
++	TARGETS=$(IPV4_TARGETS) $(IPV6_TARGETS)
++endif
+ 
+ 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
-- 
2.30.2