[package] libpcap: explicitely disable libnl support to prevent different build resul...

[openwrt.git] / package / libpcap / Makefile

diff --git a/package/libpcap/Makefile b/package/libpcap/Makefile
index bc6417d..15715eb 100644 (file)
--- a/package/libpcap/Makefile
+++ b/package/libpcap/Makefile
@@ -1,5 +1,5 @@
-# 
-# Copyright (C) 2006 OpenWrt.org
+#
+# Copyright (C) 2006-2011 OpenWrt.org

 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.


@@ -8,44 +8,41 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libpcap
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libpcap

-PKG_VERSION:=1.0.0
-PKG_RELEASE:=1
+PKG_VERSION:=1.1.1
+PKG_RELEASE:=2

 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.tcpdump.org/release/
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.tcpdump.org/release/

-PKG_MD5SUM:=9ad1358c5dec48456405eac197a46d3d
+PKG_MD5SUM:=1bca27d206970badae248cfa471bbb47
+
+PKG_INSTALL:=1

 
 include $(INCLUDE_DIR)/package.mk
 
 include $(INCLUDE_DIR)/package.mk

+include $(INCLUDE_DIR)/kernel.mk

 
 define Package/libpcap
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=Low-level packet capture library
   URL:=http://www.tcpdump.org/
 
 define Package/libpcap
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=Low-level packet capture library
   URL:=http://www.tcpdump.org/

+  MENU:=1

 endef
 
 define Package/libpcap/description
 endef
 
 define Package/libpcap/description

- This package contains a system-independent library for user-level network
- packet capture.
+This package contains a system-independent library for user-level network packet
+capture.

 endef
 
 define Package/libpcap/config
 endef
 
 define Package/libpcap/config

-       config PCAP_HAS_USB
-               bool "Include USB support"
-               depends PACKAGE_libpcap
-               depends PACKAGE_kmod-usb-core
-               default n
-
-       config PCAP_HAS_BT
-               bool "Include bluetooth support"
-               depends PACKAGE_libpcap
-               depends PACKAGE_kmod-bluetooth
-               default n
-
+       source "$(SOURCE)/Config.in"

 endef
 
 TARGET_CFLAGS += \
 endef
 
 TARGET_CFLAGS += \

-       -ffunction-sections -fdata-sections
+       -ffunction-sections \
+       -fdata-sections
+
+CONFIGURE_VARS += \
+       ac_cv_linux_vers=$(LINUX_VERSION)

 
 CONFIGURE_ARGS += \
        --enable-shared \
 
 CONFIGURE_ARGS += \
        --enable-shared \


@@ -55,32 +52,31 @@ CONFIGURE_ARGS += \
        --with-build-cc="$(HOSTCC)" \
        --with-pcap=linux \
        --without-septel \
        --with-build-cc="$(HOSTCC)" \
        --with-pcap=linux \
        --without-septel \

-       --without-dag
+       --without-dag \
+       --without-libnl

 
 

-define Build/Compile
-       rm -rf $(PKG_INSTALL_DIR)
+MAKE_FLAGS += \
+       CCOPT="$(TARGET_CFLAGS) -I$(BUILD_DIR)/linux/include"
+
+define Build/Configure
+       $(call Build/Configure/Default)

        $(if $(CONFIG_PCAP_HAS_USB),,$(SED) '/^#define PCAP_SUPPORT_USB/D' $(PKG_BUILD_DIR)/config.h)
        $(if $(CONFIG_PCAP_HAS_USB),,$(SED) 's/pcap-usb-linux.c *//' $(PKG_BUILD_DIR)/Makefile)
        $(if $(CONFIG_PCAP_HAS_BT),,$(SED) '/^#define PCAP_SUPPORT_BT/D' $(PKG_BUILD_DIR)/config.h)
        $(if $(CONFIG_PCAP_HAS_USB),,$(SED) '/^#define PCAP_SUPPORT_USB/D' $(PKG_BUILD_DIR)/config.h)
        $(if $(CONFIG_PCAP_HAS_USB),,$(SED) 's/pcap-usb-linux.c *//' $(PKG_BUILD_DIR)/Makefile)
        $(if $(CONFIG_PCAP_HAS_BT),,$(SED) '/^#define PCAP_SUPPORT_BT/D' $(PKG_BUILD_DIR)/config.h)

-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               CCOPT="$(TARGET_CFLAGS) -I$(BUILD_DIR)/linux/include" \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install
+       $(if $(CONFIG_PCAP_HAS_BT),,$(SED) 's/pcap-bt-linux.c *//' $(PKG_BUILD_DIR)/Makefile)

 endef
 
 define Build/InstallDev
 endef
 
 define Build/InstallDev

-       mkdir -p $(1)/usr/include $(1)/usr/lib
-       $(CP) \
-               $(PKG_INSTALL_DIR)/usr/include/pcap* \
-               $(1)/usr/include/
-       $(CP) \
-               $(PKG_INSTALL_DIR)/usr/lib/libpcap.{a,so*} \
-               $(1)/usr/lib/
+       $(INSTALL_DIR) $(1)/usr/include
+       $(CP) $(PKG_INSTALL_DIR)/usr/include/pcap* $(1)/usr/include/
+
+       $(INSTALL_DIR) $(1)/usr/lib
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpcap.{a,so*} $(1)/usr/lib/

 endef
 
 define Package/libpcap/install
        $(INSTALL_DIR) $(1)/usr/lib
 endef
 
 define Package/libpcap/install
        $(INSTALL_DIR) $(1)/usr/lib

-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpcap.so.* $(1)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpcap.so* $(1)/usr/lib/

 endef
 
 $(eval $(call BuildPackage,libpcap))
 endef
 
 $(eval $(call BuildPackage,libpcap))