X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/6b53157103d462f7ea0b81f9fe77412719ea2260..3291e76d6802e9c1f5d88c1c77a8a080f3b2a75b:/package/libpcap/Makefile?ds=inline

diff --git a/package/libpcap/Makefile b/package/libpcap/Makefile
index fa79e7461..960caf133 100644
--- a/package/libpcap/Makefile
+++ b/package/libpcap/Makefile
@@ -3,83 +3,95 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libpcap
-PKG_VERSION:=0.8.3
+PKG_VERSION:=0.9.4
 PKG_RELEASE:=1
-PKG_MD5SUM:=56a9d4615d8354fcfe8cff8c8443c77b
 
-PKG_SOURCE_URL:=http://www.tcpdump.org/release/
+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_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(TOPDIR)/package/rules.mk
 
-$(eval $(call PKG_template,LIBPCAP,libpcap,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+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/
+endef
 
-$(PKG_BUILD_DIR)/.configured:
-	(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
+define Build/Configure
+	(cd $(PKG_BUILD_DIR); rm -f config.cache; \
 		$(TARGET_CONFIGURE_OPTS) \
 		CFLAGS="$(TARGET_CFLAGS)" \
-		CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
-		LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
-		ac_cv_linux_vers=$(BR2_DEFAULT_KERNEL_HEADERS) \
+		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 \
-		  --with-build-cc=$(HOSTCC) \
-		  --with-pcap=linux \
+			--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 \
 	);
-	touch $@
+endef
 
-$(PKG_BUILD_DIR)/.built:
+define Build/Compile
 	rm -rf $(PKG_INSTALL_DIR)
 	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
-		CCOPT="$(TARGET_CFLAGS)" \
+		CCOPT="$(TARGET_CFLAGS) -I$(BUILD_DIR)/linux/include" \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		all install
-	touch $@
+endef
 
-$(IPKG_LIBPCAP):
-	install -m0755 -d $(IDIR_LIBPCAP)/usr/lib
-	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libpcap.so.* $(IDIR_LIBPCAP)/usr/lib/
-	$(RSTRIP) $(IDIR_LIBPCAP)
-	$(IPKG_BUILD) $(IDIR_LIBPCAP) $(PACKAGE_DIR)
+define Package/libpcap/install
+	install -m0755 -d $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libpcap.so.* $(1)/usr/lib/
+endef
 
-$(STAGING_DIR)/usr/lib/libpcap.so: $(PKG_BUILD_DIR)/.built
+define Build/InstallDev
 	mkdir -p $(STAGING_DIR)/usr/include
-	cp -fpR $(PKG_INSTALL_DIR)/usr/include/pcap* $(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 -fpR $(PKG_INSTALL_DIR)/usr/lib/libpcap.{a,so*} $(STAGING_DIR)/usr/lib/
-	touch $(STAGING_DIR)/usr/lib/libpcap.so
-
-install-dev: $(STAGING_DIR)/usr/lib/libpcap.so
+	$(CP)	$(PKG_INSTALL_DIR)/usr/lib/libpcap.a \
+		$(PKG_INSTALL_DIR)/usr/lib/libpcap.so* \
+		$(STAGING_DIR)/usr/lib/
+endef
 
-uninstall-dev:
-	rm -rf $(STAGING_DIR)/usr/include/pcap*
-	rm -rf $(STAGING_DIR)/usr/lib/libpcap.{a,so*}
+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*
+endef
 
-compile-targets: install-dev
-clean-targets: uninstall-dev
+$(eval $(call BuildPackage,libpcap))