[PATCH] Update iputils to 20101006

[openwrt/svn-archive/archive.git] / net / iputils / Makefile

diff --git a/net/iputils/Makefile b/net/iputils/Makefile
index 736144ae2a36a9b90cffd4b8a6c4b76c4baf4b2b..712076b0d15f7c66b834c540743b4e63bcb61eb8 100644 (file)
--- a/net/iputils/Makefile
+++ b/net/iputils/Makefile
@@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,25 +8,31 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=iputils
-PKG_VERSION:=20100418
+PKG_VERSION:=20101006
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-s$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.skbuff.net/iputils
-PKG_MD5SUM:=df6b0062118cdc5c62e3c810f831e976
+PKG_MD5SUM:=a36c25e9ec17e48be514dc0485e7376c
 
+PKG_BUILD_DEPENDS:=sysfsutils
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-s$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/package.mk
 
 
-
-define Package/iputils-arping
+define Package/iputils/Default
   SECTION:=net
   CATEGORY:=Network
-  TITLE:=iputils - arping
   URL:=http://www.skbuff.net/iputils
-  DEPENDS:= +sysfsutils
+  DEPENDS:= @!LINUX_2_4
+endef
+
+
+define Package/iputils-arping
+$(call Package/iputils/Default)
+  TITLE:=iputils - arping
+  DEPENDS+= +libsysfs
 endef
 
 define Package/iputils-arping/description
@@ -34,11 +40,10 @@ define Package/iputils-arping/description
   Sends ARP REQUEST to a neighbour host.
 endef
 
+
 define Package/iputils-clockdiff
-  SECTION:=net
-  CATEGORY:=Network
+$(call Package/iputils/Default)
   TITLE:=iputils - clockdiff
-  URL:=http://www.skbuff.net/iputils
 endef
 
 define Package/iputils-clockdiff/description
@@ -46,11 +51,10 @@ define Package/iputils-clockdiff/description
   Measures clock difference between hosts.
 endef
 
+
 define Package/iputils-ping
-  SECTION:=net
-  CATEGORY:=Network
+$(call Package/iputils/Default)
   TITLE:=iputils - ping
-  URL:=http://www.skbuff.net/iputils
 endef
 
 define Package/iputils-ping/description
@@ -58,12 +62,11 @@ define Package/iputils-ping/description
   Sends ICMP ECHO_REQUEST to network hosts (IPv4).
 endef
 
+
 define Package/iputils-ping6
-  SECTION:=net
-  CATEGORY:=Network
+$(call Package/iputils/Default)
   TITLE:=iputils - ping6
-  URL:=http://www.skbuff.net/iputils
-  DEPENDS += @IPV6
+  DEPENDS+= @IPV6
 endef
 
 define Package/iputils-ping6/description
@@ -71,11 +74,10 @@ define Package/iputils-ping6/description
   Sends ICMP ECHO_REQUEST to network hosts (IPv6).
 endef
 
+
 define Package/iputils-tftpd
-  SECTION:=net
-  CATEGORY:=Network
+$(call Package/iputils/Default)
   TITLE:=iputils - tftpd
-  URL:=http://www.skbuff.net/iputils
 endef
 
 define Package/iputils-tftpd/description
@@ -83,11 +85,10 @@ define Package/iputils-tftpd/description
   Trivial File Transfer Protocol server.
 endef
 
+
 define Package/iputils-tracepath
-  SECTION:=net
-  CATEGORY:=Network
+$(call Package/iputils/Default)
   TITLE:=iputils - tracepath
-  URL:=http://www.skbuff.net/iputils
 endef
 
 define Package/iputils-tracepath/description
@@ -95,12 +96,11 @@ define Package/iputils-tracepath/description
   Traces path to a network host discovering MTU along this path (IPv4).
 endef
 
+
 define Package/iputils-tracepath6
-  SECTION:=net
-  CATEGORY:=Network
+$(call Package/iputils/Default)
   TITLE:=iputils - tracepath6
-  URL:=http://www.skbuff.net/iputils
-  DEPENDS += @IPV6
+  DEPENDS+= @IPV6
 endef
 
 define Package/iputils-tracepath6/description
@@ -108,12 +108,11 @@ define Package/iputils-tracepath6/description
   Traces path to a network host discovering MTU along this path (IPv6).
 endef
 
+
 define Package/iputils-traceroute6
-  SECTION:=net
-  CATEGORY:=Network
+$(call Package/iputils/Default)
   TITLE:=iputils - traceroute6
-  URL:=http://www.skbuff.net/iputils
-  DEPENDS += @IPV6
+  DEPENDS+= @IPV6
 endef
 
 define Package/iputils-traceroute6/description
@@ -121,8 +120,14 @@ define Package/iputils-traceroute6/description
   Traces path to a network host (IPv6).
 endef
 
+ifeq ($(BOARD),brcm47xx)
+  TARGET_CFLAGS += -O2 
+endif
+
 MAKE_FLAGS += \
-       CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include -L$(STAGING_DIR)/usr/lib" 
+       CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS)" \
+       CONFIG_IPV6="$(CONFIG_IPV6)" \
+       CONFIG_USE_UCLIBC="$(CONFIG_USE_UCLIBC)" \
 
 define Package/iputils-arping/install
        $(INSTALL_DIR) $(1)/usr/bin
@@ -169,8 +174,6 @@ $(eval $(call BuildPackage,iputils-clockdiff))
 $(eval $(call BuildPackage,iputils-ping))
 $(eval $(call BuildPackage,iputils-tftpd))
 $(eval $(call BuildPackage,iputils-tracepath))
-ifeq ($(CONFIG_IPV6),y)
-       $(eval $(call BuildPackage,iputils-ping6))
-       $(eval $(call BuildPackage,iputils-tracepath6))
-       $(eval $(call BuildPackage,iputils-traceroute6))
-endif
+$(eval $(call BuildPackage,iputils-ping6))
+$(eval $(call BuildPackage,iputils-tracepath6))
+$(eval $(call BuildPackage,iputils-traceroute6))