X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=package%2Flibpcap%2FMakefile;h=e54950002d5c06ea39798a19335a12d0c544cf88;hb=41d5e0ca05f7ad4827c4fea00d17bd280d83d8be;hp=960caf133d7bc49e3a61b71130871fa69bda1568;hpb=a8f632da6583439bddf8b41341f2d4f51ae884bb;p=openwrt.git

diff --git a/package/libpcap/Makefile b/package/libpcap/Makefile
index 960caf133d..e54950002d 100644
--- a/package/libpcap/Makefile
+++ b/package/libpcap/Makefile
@@ -1,97 +1,92 @@
-# $Id$
+# 
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libpcap
-PKG_VERSION:=0.9.4
+PKG_VERSION:=1.0.0
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.tcpdump.org/release/
-PKG_MD5SUM:=79025766e8027df154cb1f32de8a7974
-PKG_CAT:=zcat
+PKG_MD5SUM:=9ad1358c5dec48456405eac197a46d3d
 
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
-include $(TOPDIR)/package/rules.mk
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/kernel.mk
 
 define Package/libpcap
- SECTION:=base
- CATEGORY:=Libraries
- TITLE:=Low-level packet capture library
- DESCRIPTION:=A system-independent library for user-level network packet capture.
- URL:=http://www.tcpdump.org/
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=Low-level packet capture library
+  URL:=http://www.tcpdump.org/
 endef
 
-define Build/Configure
-	(cd $(PKG_BUILD_DIR); rm -f config.cache; \
-		$(TARGET_CONFIGURE_OPTS) \
-		CFLAGS="$(TARGET_CFLAGS)" \
-		CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
-		LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
-		ac_cv_linux_vers= \
-		./configure \
-			--target=$(GNU_TARGET_NAME) \
-			--host=$(GNU_TARGET_NAME) \
-			--build=$(GNU_HOST_NAME) \
-			--program-prefix="" \
-			--program-suffix="" \
-			--prefix=/usr \
-			--exec-prefix=/usr \
-			--bindir=/usr/bin \
-			--datadir=/usr/share \
-			--includedir=/usr/include \
-			--infodir=/usr/share/info \
-			--libdir=/usr/lib \
-			--libexecdir=/usr/lib \
-			--localstatedir=/var \
-			--mandir=/usr/share/man \
-			--sbindir=/usr/sbin \
-			--sysconfdir=/etc \
-			$(DISABLE_NLS) \
-			$(DISABLE_LARGEFILE) \
-			--enable-shared \
-			--enable-static \
-			--disable-yydebug \
-			--enable-ipv6 \
-			--with-build-cc=$(HOSTCC) \
-			--with-pcap=linux \
-	);
+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_VARS += \
+	ac_cv_linux_vers=$(LINUX_VERSION)
+
+CONFIGURE_ARGS += \
+	--enable-shared \
+	--enable-static \
+	--disable-yydebug \
+	--enable-ipv6 \
+	--with-build-cc="$(HOSTCC)" \
+	--with-pcap=linux \
+	--without-septel \
+	--without-dag
+
 define Build/Compile
 	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(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)" \
 		all install
 endef
 
-define Package/libpcap/install
-	install -m0755 -d $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libpcap.so.* $(1)/usr/lib/
-endef
-
 define Build/InstallDev
-	mkdir -p $(STAGING_DIR)/usr/include
-	$(CP)	$(PKG_INSTALL_DIR)/usr/include/pcap.h \
-		$(PKG_INSTALL_DIR)/usr/include/pcap-bpf.h \
-		$(PKG_INSTALL_DIR)/usr/include/pcap-namedb.h \
-		$(STAGING_DIR)/usr/include/
-	mkdir -p $(STAGING_DIR)/usr/lib
-	$(CP)	$(PKG_INSTALL_DIR)/usr/lib/libpcap.a \
-		$(PKG_INSTALL_DIR)/usr/lib/libpcap.so* \
-		$(STAGING_DIR)/usr/lib/
+	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 Build/UninstallDev
-	rm -rf	$(STAGING_DIR)/usr/include/pcap.h \
-		$(STAGING_DIR)/usr/include/pcap-bpf.h \
-		$(STAGING_DIR)/usr/include/pcap-namedb.h \
-		$(STAGING_DIR)/usr/lib/libpcap.a \
-		$(STAGING_DIR)/usr/lib/libpcap.so*
+define Package/libpcap/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libpcap.so.* $(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,libpcap))