X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=package%2Flibpcap%2FMakefile;h=eef5ff06403ada72c3f7ad9140c4b93578bbdc47;hb=59d130d86713c0c81543ff73e7fade9212ede98f;hp=20eb17e70a57d8f71029cfae760c666140d3ea4d;hpb=d6299cafc8a31a7461ba8f26f4ac08ce5a8d93c6;p=oweals%2Fopenwrt.git

diff --git a/package/libpcap/Makefile b/package/libpcap/Makefile
index 20eb17e70a..eef5ff0640 100644
--- a/package/libpcap/Makefile
+++ b/package/libpcap/Makefile
@@ -4,21 +4,16 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libpcap
-PKG_VERSION:=0.9.4
+PKG_VERSION:=1.0.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.tcpdump.org/release/
-PKG_MD5SUM:=79025766e8027df154cb1f32de8a7974
-PKG_CAT:=zcat
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+PKG_MD5SUM:=9ad1358c5dec48456405eac197a46d3d
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -26,21 +21,49 @@ define Package/libpcap
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=Low-level packet capture library
-  DESCRIPTION:=\
-	This package contains a system-independent library for user-level \\\
-	network packet capture.
   URL:=http://www.tcpdump.org/
 endef
 
+define Package/libpcap/description
+ This package contains a system-independent library for user-level network
+ packet capture.
+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
+		depends BROKEN
+		default n
+
+endef
+
+TARGET_CFLAGS += \
+	-ffunction-sections -fdata-sections
+
 CONFIGURE_ARGS += \
 	--enable-shared \
 	--enable-static \
 	--disable-yydebug \
 	--enable-ipv6 \
 	--with-build-cc="$(HOSTCC)" \
-	--with-pcap=linux
+	--with-pcap=linux \
+	--without-septel \
+	--without-dag
 
 define Build/Compile
+	rm -rf $(PKG_INSTALL_DIR)
+	$(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_BT),,$(SED) 's/pcap-bt-linux.c *//' $(PKG_BUILD_DIR)/Makefile)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		CCOPT="$(TARGET_CFLAGS) -I$(BUILD_DIR)/linux/include" \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
@@ -48,17 +71,13 @@ define Build/Compile
 endef
 
 define Build/InstallDev
-	mkdir -p $(STAGING_DIR)/usr/include
-	$(CP)	$(PKG_INSTALL_DIR)/usr/include/pcap{,-bpf,-namedb}.h \
-		$(STAGING_DIR)/usr/include/
-	mkdir -p $(STAGING_DIR)/usr/lib
-	$(CP)	$(PKG_INSTALL_DIR)/usr/lib/libpcap.{a,so*} \
-		$(STAGING_DIR)/usr/lib/
-endef
-
-define Build/UninstallDev
-	rm -rf	$(STAGING_DIR)/usr/include/pcap{,-bpf,-named}.h \
-		$(STAGING_DIR)/usr/lib/libpcap.{a,so*}
+	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/
 endef
 
 define Package/libpcap/install