Change libpcap, uniformize package makefile, put back control file in ./ipkg

[openwrt.git] / openwrt / package / libpcap / Makefile

diff --git a/openwrt/package/libpcap/Makefile b/openwrt/package/libpcap/Makefile
index 279190c..0a0e518 100644 (file)
--- a/openwrt/package/libpcap/Makefile
+++ b/openwrt/package/libpcap/Makefile
@@ -1,60 +1,96 @@
+# $Id$
+
 include $(TOPDIR)/rules.mk
 
-PKG_NAME := libpcap
-PKG_VERSION := 0.8.3
-PKG_RELEASE := 1
+PKG_NAME:=libpcap
+PKG_VERSION:=0.8.3
+PKG_RELEASE:=1
+PKG_MD5SUM:=56a9d4615d8354fcfe8cff8c8443c77b
 
-PKG_SOURCE_SITE := http://www.tcpdump.org/release
-PKG_SOURCE_FILE := $(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_CAT := zcat
-PKG_SOURCE_DIR := $(PKG_NAME)-$(PKG_VERSION)
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_SOURCE_DIR)
+PKG_SOURCE_URL:= \
+       http://www.tcpdump.org/release \
+       http://nthill.free.fr/openwrt/sources/$(PKG_NAME)/
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_CAT:=zcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)/$(PKG_NAME)-$(PKG_VERSION)
 
-$(DL_DIR)/$(PKG_SOURCE_FILE):
-       mkdir -p $(DL_DIR)
-       $(WGET) -P $(DL_DIR) $(PKG_SOURCE_SITE)/$(PKG_SOURCE_FILE)
+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
 
-$(PKG_BUILD_DIR)/.patched: $(DL_DIR)/$(PKG_SOURCE_FILE)
-       mkdir -p $(TOOL_BUILD_DIR)
-       $(PKG_SOURCE_CAT) $(DL_DIR)/$(PKG_SOURCE_FILE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-       $(PATCH) $(PKG_BUILD_DIR) . ./patches
-       touch $(PKG_BUILD_DIR)/.patched
+$(DL_DIR)/$(PKG_SOURCE):
+       $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) $(PKG_MD5SUM) $(PKG_SOURCE_URL)
 
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.patched
-       (cd $(PKG_BUILD_DIR); rm -rf config.cache; \
-               ac_cv_linux_vers=$(BR2_DEFAULT_KERNEL_HEADERS) \
-               BUILD_CC=$(TARGET_CC) HOSTCC=$(HOSTCC) \
+$(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
+       (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
                $(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) \
                ./configure \
-               --target=$(GNU_TARGET_NAME) \
-               --host=$(GNU_TARGET_NAME) \
-               --build=$(GNU_HOST_NAME) \
-               --with-build-cc=$(HOSTCC) \
-               --disable-yydebug \
-               --prefix=/usr \
-               --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 \
+                 --with-build-cc=$(HOSTCC) \
+                 --with-pcap=linux \
        );
        touch $(PKG_BUILD_DIR)/.configured
 
-$(PKG_BUILD_DIR)/libpcap.a: $(PKG_BUILD_DIR)/.configured
-       $(MAKE) AR="$(TARGET_CROSS)ar" -C $(PKG_BUILD_DIR)
+$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
+       $(MAKE) -C $(PKG_BUILD_DIR) \
+               CCOPT="$(TARGET_CFLAGS)"
+       touch $(PKG_BUILD_DIR)/.built
 
-$(STAGING_DIR)/lib/libpcap.a: $(PKG_BUILD_DIR)/libpcap.a
+$(STAGING_DIR)/usr/lib/libpcap.so: $(PKG_BUILD_DIR)/.built
        $(MAKE) -C $(PKG_BUILD_DIR) \
-               prefix=$(STAGING_DIR) \
-               exec_prefix=$(STAGING_DIR) \
-               bindir=$(STAGING_DIR)/bin \
-               datadir=$(STAGING_DIR)/share \
+               DESTDIR="$(STAGING_DIR)" \
                install
 
-source: $(DL_DIR)/$(PKG_SOURCE_FILE)
-prepare: $(PKG_BUILD_DIR)/.patched
-compile: $(STAGING_DIR)/lib/libpcap.a
-install:
+$(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)
+       install -m0755 -d $(IDIR_LIBPCAP)/usr/lib
+       cp -fpR $(STAGING_DIR)/usr/lib/libpcap.so.* $(IDIR_LIBPCAP)/usr/lib/
+       $(RSTRIP) $(IDIR_LIBPCAP)
+       mkdir -p $(PACKAGE_DIR)
+       $(IPKG_BUILD) $(IDIR_LIBPCAP) $(PACKAGE_DIR)
 
-clean:
-       rm -rf $(PKG_BUILD_DIR)
-       rm -f $(STAGING_DIR)/lib/libpcap*
+$(INFO_LIBPCAP): $(IPKG_LIBPCAP)
+       $(IPKG) install $(IPKG_LIBPCAP)
 
+source: $(DL_DIR)/$(PKG_SOURCE)
+prepare: $(PKG_BUILD_DIR)/.prepared
+compile: $(IPKG_LIBPCAP)
+install: $(INFO_LIBPCAP)
+
+clean:
+       -$(MAKE) -C $(PKG_BUILD_DIR) \
+               DESTDIR="$(STAGING_DIR)" \
+               uninstall
+       rm -rf $(PKG_BUILD_DIR) $(IPKG_LIBPCAP)