X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/d0149fc434f0da76adab37a3f6b66157a26afdf5..296af0765342e14cb545763aa7b1d906e224d7ca:/openwrt/package/libpcap/Makefile?ds=inline

diff --git a/openwrt/package/libpcap/Makefile b/openwrt/package/libpcap/Makefile
index 0a0e5181f..67bc3f7fd 100644
--- a/openwrt/package/libpcap/Makefile
+++ b/openwrt/package/libpcap/Makefile
@@ -3,32 +3,22 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libpcap
-PKG_VERSION:=0.8.3
+PKG_VERSION:=0.9.4
 PKG_RELEASE:=1
-PKG_MD5SUM:=56a9d4615d8354fcfe8cff8c8443c77b
+PKG_MD5SUM:=79025766e8027df154cb1f32de8a7974
 
-PKG_SOURCE_URL:= \
-	http://www.tcpdump.org/release \
-	http://nthill.free.fr/openwrt/sources/$(PKG_NAME)/
+PKG_SOURCE_URL:=http://www.tcpdump.org/release/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_CAT:=zcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
-IPKG_LIBPCAP:=$(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
-IDIR_LIBPCAP:=$(PKG_BUILD_DIR)/ipkg/$(PKG_NAME)
-INFO_LIBPCAP:=$(IPKG_STATE_DIR)/info/$(PKG_NAME).list
+include $(TOPDIR)/package/rules.mk
 
-$(DL_DIR)/$(PKG_SOURCE):
-	$(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) $(PKG_MD5SUM) $(PKG_SOURCE_URL)
+$(eval $(call PKG_template,LIBPCAP,libpcap,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
-$(PKG_BUILD_DIR)/.prepared: $(DL_DIR)/$(PKG_SOURCE)
-	mkdir -p $(BUILD_DIR)/$(PKG_NAME)
-	$(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR)/$(PKG_NAME) $(TAR_OPTIONS) -
-	$(PATCH) $(PKG_BUILD_DIR) ./patches
-	touch $(PKG_BUILD_DIR)/.prepared
-
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+$(PKG_BUILD_DIR)/.configured:
 	(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
 		$(TARGET_CONFIGURE_OPTS) \
 		CFLAGS="$(TARGET_CFLAGS)" \
@@ -58,39 +48,39 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
 		  --enable-shared \
 		  --enable-static \
 		  --disable-yydebug \
+		  --enable-ipv6 \
 		  --with-build-cc=$(HOSTCC) \
 		  --with-pcap=linux \
 	);
-	touch $(PKG_BUILD_DIR)/.configured
-
-$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		CCOPT="$(TARGET_CFLAGS)"
-	touch $(PKG_BUILD_DIR)/.built
+	touch $@
 
-$(STAGING_DIR)/usr/lib/libpcap.so: $(PKG_BUILD_DIR)/.built
+$(PKG_BUILD_DIR)/.built:
+	rm -rf $(PKG_INSTALL_DIR)
+	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(STAGING_DIR)" \
-		install
+		CCOPT="$(TARGET_CFLAGS) -I$(BUILD_DIR)/linux/include" \
+		DESTDIR="$(PKG_INSTALL_DIR)" \
+		all install
+	touch $@
 
-$(IPKG_LIBPCAP): $(STAGING_DIR)/usr/lib/libpcap.so
-	$(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_LIBPCAP) ./ipkg/$(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
+$(IPKG_LIBPCAP):
 	install -m0755 -d $(IDIR_LIBPCAP)/usr/lib
-	cp -fpR $(STAGING_DIR)/usr/lib/libpcap.so.* $(IDIR_LIBPCAP)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libpcap.so.* $(IDIR_LIBPCAP)/usr/lib/
 	$(RSTRIP) $(IDIR_LIBPCAP)
-	mkdir -p $(PACKAGE_DIR)
 	$(IPKG_BUILD) $(IDIR_LIBPCAP) $(PACKAGE_DIR)
 
-$(INFO_LIBPCAP): $(IPKG_LIBPCAP)
-	$(IPKG) install $(IPKG_LIBPCAP)
+$(STAGING_DIR)/usr/lib/libpcap.so: $(PKG_BUILD_DIR)/.built
+	mkdir -p $(STAGING_DIR)/usr/include
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/pcap* $(STAGING_DIR)/usr/include/
+	mkdir -p $(STAGING_DIR)/usr/lib
+	$(CP) $(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
 
-source: $(DL_DIR)/$(PKG_SOURCE)
-prepare: $(PKG_BUILD_DIR)/.prepared
-compile: $(IPKG_LIBPCAP)
-install: $(INFO_LIBPCAP)
+uninstall-dev:
+	rm -rf $(STAGING_DIR)/usr/include/pcap*
+	rm -rf $(STAGING_DIR)/usr/lib/libpcap.{a,so*}
 
-clean:
-	-$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(STAGING_DIR)" \
-		uninstall
-	rm -rf $(PKG_BUILD_DIR) $(IPKG_LIBPCAP)
+compile-targets: install-dev
+clean-targets: uninstall-dev