bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@22011 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
acoul 2010-07-01 08:53:07 +00:00
parent 4ffa724b7a
commit 9a0c03bca4
3 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
net/iputils/Makefile
View File

@ -62,6 +62,7 @@ define Package/iputils-ping6
CATEGORY:=Network CATEGORY:=Network
TITLE:=iputils - ping6 TITLE:=iputils - ping6
URL:=http://www.skbuff.net/iputils URL:=http://www.skbuff.net/iputils
DEPENDS += @IPV6
endef endef
define Package/iputils-ping6/description define Package/iputils-ping6/description
@ -98,6 +99,7 @@ define Package/iputils-tracepath6
CATEGORY:=Network CATEGORY:=Network
TITLE:=iputils - tracepath6 TITLE:=iputils - tracepath6
URL:=http://www.skbuff.net/iputils URL:=http://www.skbuff.net/iputils
DEPENDS += @IPV6
endef endef
define Package/iputils-tracepath6/description define Package/iputils-tracepath6/description
@ -110,6 +112,7 @@ define Package/iputils-traceroute6
CATEGORY:=Network CATEGORY:=Network
TITLE:=iputils - traceroute6 TITLE:=iputils - traceroute6
URL:=http://www.skbuff.net/iputils URL:=http://www.skbuff.net/iputils
DEPENDS += @IPV6
endef endef
define Package/iputils-traceroute6/description define Package/iputils-traceroute6/description
@ -163,8 +166,10 @@ endef
$(eval $(call BuildPackage,iputils-arping)) $(eval $(call BuildPackage,iputils-arping))
$(eval $(call BuildPackage,iputils-clockdiff)) $(eval $(call BuildPackage,iputils-clockdiff))
$(eval $(call BuildPackage,iputils-ping)) $(eval $(call BuildPackage,iputils-ping))
$(eval $(call BuildPackage,iputils-ping6))
$(eval $(call BuildPackage,iputils-tftpd)) $(eval $(call BuildPackage,iputils-tftpd))
$(eval $(call BuildPackage,iputils-tracepath)) $(eval $(call BuildPackage,iputils-tracepath))
$(eval $(call BuildPackage,iputils-tracepath6)) ifeq ($(CONFIG_IPV6),y)
$(eval $(call BuildPackage,iputils-traceroute6)) $(eval $(call BuildPackage,iputils-ping6))
$(eval $(call BuildPackage,iputils-tracepath6))
$(eval $(call BuildPackage,iputils-traceroute6))
endif

0
net/iputils/patches/iputils.patch → net/iputils/patches/001-iputils.patch
View File

23
net/iputils/patches/002-fix-ipv6.patch Normal file
View File

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