i2c-tools: make the python dependency optional

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

diff --git a/net/tcpdump/Makefile b/net/tcpdump/Makefile
index 040eba63afdf3de94b75e3126af1329357473b03..de0f5db66f4f5b79348c48f64ccfaf7c3c60fa4a 100644 (file)
--- a/net/tcpdump/Makefile
+++ b/net/tcpdump/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2007-2009 OpenWrt.org
+# Copyright (C) 2007-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=tcpdump
-PKG_VERSION:=4.0.0
+PKG_VERSION:=4.1.1
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
@@ -16,10 +16,12 @@ PKG_SOURCE_URL:=http://www.tcpdump.org/release/ \
        http://ftp.gwdg.de/pub/misc/tcpdump/ \
        http://www.at.tcpdump.org/ \
        http://www.br.tcpdump.org/
-PKG_MD5SUM:=b22ca72890df2301d922c9f2d17867f9
+PKG_MD5SUM:=d0dd58bbd6cd36795e05c6f1f74420b0
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 
+PKG_INSTALL:=1
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/tcpdump/default
@@ -41,28 +43,29 @@ define Package/tcpdump-mini
   VARIANT:=mini
 endef
 
-CONFIGURE_ARGS += --without-crypto
+CONFIGURE_ARGS += \
+       --without-crypto \
+       --enable-ipv6
 
 CONFIGURE_VARS += \
        BUILD_CC="$(TARGET_CC)" \
        HOSTCC="$(HOSTCC)" \
-       td_cv_buggygetaddrinfo="no"
+       td_cv_buggygetaddrinfo="no" \
+       ac_cv_linux_vers=$(LINUX_VERSION) \
+       ac_cv_header_rpc_rpcent_h=no \
+       ac_cv_lib_rpc_main=no
+
+MAKE_FLAGS :=
 
 ifeq ($(BUILD_VARIANT),mini)
   TARGET_CFLAGS += -DTCPDUMP_MINI
   CONFIGURE_ARGS += --disable-smb
-  MAKE_FLAGS := TCPDUMP_MINI=1
-else
-  MAKE_FLAGS :=
+  MAKE_FLAGS += TCPDUMP_MINI=1
 endif
 
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               CCOPT="$(TARGET_CFLAGS)" INCLS="-I. $(TARGET_CPPFLAGS)" \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               $(MAKE_FLAGS) \
-               all install
-endef
+MAKE_FLAGS += \
+       CCOPT="$(TARGET_CFLAGS)" INCLS="-I. $(TARGET_CPPFLAGS)"
+
 
 define Package/tcpdump/install
        $(INSTALL_DIR) $(1)/usr/sbin