net/iputils: fix ipv6 compile errors (thanks florian)

SVN-Revision: 22011

diff --git a/net/iputils/Makefile b/net/iputils/Makefile
index 95a7da1242b582789cd18ed3d2c9cd874799ca58..40c4903a63987832fa9b55054c630ff1ca2cbe98 100644 (file)
--- 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/001-iputils.patch b/net/iputils/patches/001-iputils.patch
new file mode 100644 (file)
index 0000000..c07d70e
--- /dev/null
+++ b/net/iputils/patches/001-iputils.patch
@@ -0,0 +1,14 @@
+diff -ur iputils/Makefile iputils_new/Makefile
+--- iputils/Makefile   2002-09-20 18:23:55.000000000 +0000
++++ iputils_new/Makefile       2007-05-17 13:59:55.000000000 +0000
+@@ -27,8 +27,8 @@
+ CCOPT=-D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -g
+ CFLAGS=$(CCOPT) $(GLIBCFIX) -I$(KERNEL_INCLUDE) -I../include $(DEFINES) 
+ 
+-IPV4_TARGETS=tracepath ping clockdiff rdisc arping tftpd rarpd
+-IPV6_TARGETS=tracepath6 traceroute6 ping6
++IPV4_TARGETS=tracepath ping clockdiff arping tftpd
++IPV6_TARGETS=tracepath6 traceroute6 ping6
+ TARGETS=$(IPV4_TARGETS) $(IPV6_TARGETS)
+ 
+ all: check-kernel $(TARGETS)

diff --git a/net/iputils/patches/002-fix-ipv6.patch b/net/iputils/patches/002-fix-ipv6.patch
new file mode 100644 (file)
index 0000000..09617ca
--- /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

diff --git a/net/iputils/patches/iputils.patch b/net/iputils/patches/iputils.patch
deleted file mode 100644 (file)
index c07d70e..0000000
--- a/net/iputils/patches/iputils.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ur iputils/Makefile iputils_new/Makefile
---- iputils/Makefile   2002-09-20 18:23:55.000000000 +0000
-+++ iputils_new/Makefile       2007-05-17 13:59:55.000000000 +0000
-@@ -27,8 +27,8 @@
- CCOPT=-D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -g
- CFLAGS=$(CCOPT) $(GLIBCFIX) -I$(KERNEL_INCLUDE) -I../include $(DEFINES) 
- 
--IPV4_TARGETS=tracepath ping clockdiff rdisc arping tftpd rarpd
--IPV6_TARGETS=tracepath6 traceroute6 ping6
-+IPV4_TARGETS=tracepath ping clockdiff arping tftpd
-+IPV6_TARGETS=tracepath6 traceroute6 ping6
- TARGETS=$(IPV4_TARGETS) $(IPV6_TARGETS)
- 
- all: check-kernel $(TARGETS)