Make libpcap shared

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@476 3c298f89-4303-0410-b956-a3cf2f4a3e73

1 files changed, 41 insertions, 11 deletions

diff --git a/package/libpcap/Makefile b/package/libpcap/Makefile
index e9276367b7..98806c2835 100644
--- a/package/libpcap/Makefile
+++ b/package/libpcap/Makefile
@@ -12,6 +12,8 @@ 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_IPK := $(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
+PKG_IPK_DIR:=$(PKG_BUILD_DIR)/ipkg
 
 $(DL_DIR)/$(PKG_SOURCE_FILE):
 	mkdir -p $(DL_DIR)
@@ -20,7 +22,7 @@ $(DL_DIR)/$(PKG_SOURCE_FILE):
 $(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
+	$(PATCH) $(PKG_BUILD_DIR) ./patches
 	touch $(PKG_BUILD_DIR)/.patched
 
 $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.patched
@@ -33,29 +35,57 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.patched
 		--target=$(GNU_TARGET_NAME) \
 		--host=$(GNU_TARGET_NAME) \
 		--build=$(GNU_HOST_NAME) \
-		--with-build-cc=$(HOSTCC) \
-		--disable-yydebug \
+		--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 \
+		--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)
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		$(TARGET_CONFIGURE_OPTS) \
+		CCOPT="$(TARGET_CFLAGS)" \
 
-$(STAGING_DIR)/lib/libpcap.a: $(PKG_BUILD_DIR)/libpcap.a
+$(STAGING_DIR)/usr/lib/libpcap.a: $(PKG_BUILD_DIR)/libpcap.a
 	$(MAKE) -C $(PKG_BUILD_DIR) \
-		prefix=$(STAGING_DIR) \
-		exec_prefix=$(STAGING_DIR) \
-		bindir=$(STAGING_DIR)/bin \
-		datadir=$(STAGING_DIR)/share \
+		DESTDIR="$(STAGING_DIR)" \
 		install
 
+$(PKG_IPK): $(STAGING_DIR)/usr/lib/libpcap.a
+	$(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_IPK_DIR) ./ipkg/$(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
+	mkdir -p $(PKG_IPK_DIR)/usr/lib
+	cp -fpR $(STAGING_DIR)/usr/lib/libpcap.so.* $(PKG_IPK_DIR)/usr/lib/
+	$(STRIP) $(PKG_IPK_DIR)/usr/lib/*
+	mkdir -p $(PACKAGE_DIR)
+	$(IPKG_BUILD) $(PKG_IPK_DIR) $(PACKAGE_DIR)
+
+$(IPKG_STATE_DIR)/info/$(PKG_NAME).list: $(PKG_IPK)
+	$(IPKG) install $(PKG_IPK)
+
 source: $(DL_DIR)/$(PKG_SOURCE_FILE)
 prepare: $(PKG_BUILD_DIR)/.patched
 compile: $(STAGING_DIR)/lib/libpcap.a
-install:
+install: $(IPKG_STATE_DIR)/info/$(PKG_NAME).list
 
 clean:
+	-$(MAKE) -C $(PKG_BUILD_DIR) \
+		DESTDIR="$(STAGING_DIR)" \
+		uninstall clean
 	rm -rf $(PKG_BUILD_DIR)
-	rm -f $(STAGING_DIR)/lib/libpcap*
+	rm -f $(PKG_IPK)