From 0b985c05a9535cce3fbdf5bf93475626b6a96430 Mon Sep 17 00:00:00 2001 From: nbd Date: Mon, 7 Mar 2005 16:08:45 +0000 Subject: add libpcap git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@338 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/libpcap/Makefile | 60 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 package/libpcap/Makefile (limited to 'package/libpcap/Makefile') diff --git a/package/libpcap/Makefile b/package/libpcap/Makefile new file mode 100644 index 000000000..279190c02 --- /dev/null +++ b/package/libpcap/Makefile @@ -0,0 +1,60 @@ +include $(TOPDIR)/rules.mk + +PKG_NAME := libpcap +PKG_VERSION := 0.8.3 +PKG_RELEASE := 1 + +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) + + +$(DL_DIR)/$(PKG_SOURCE_FILE): + mkdir -p $(DL_DIR) + $(WGET) -P $(DL_DIR) $(PKG_SOURCE_SITE)/$(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 + touch $(PKG_BUILD_DIR)/.patched + +$(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) \ + $(TARGET_CONFIGURE_OPTS) \ + CFLAGS="$(TARGET_CFLAGS)" \ + ./configure \ + --target=$(GNU_TARGET_NAME) \ + --host=$(GNU_TARGET_NAME) \ + --build=$(GNU_HOST_NAME) \ + --with-build-cc=$(HOSTCC) \ + --disable-yydebug \ + --prefix=/usr \ + --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) + +$(STAGING_DIR)/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 \ + install + +source: $(DL_DIR)/$(PKG_SOURCE_FILE) +prepare: $(PKG_BUILD_DIR)/.patched +compile: $(STAGING_DIR)/lib/libpcap.a +install: + +clean: + rm -rf $(PKG_BUILD_DIR) + rm -f $(STAGING_DIR)/lib/libpcap* + -- cgit v1.2.3 From 0d52ac0f6a06a36bc0f0316b8593f1f8dc3a8a53 Mon Sep 17 00:00:00 2001 From: nbd Date: Sat, 19 Mar 2005 22:51:51 +0000 Subject: add downloading script (with md5sum checking and sourceforge downloading support) git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@391 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/libpcap/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/libpcap/Makefile') diff --git a/package/libpcap/Makefile b/package/libpcap/Makefile index 279190c02..6d0dfafe7 100644 --- a/package/libpcap/Makefile +++ b/package/libpcap/Makefile @@ -13,7 +13,7 @@ PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_SOURCE_DIR) $(DL_DIR)/$(PKG_SOURCE_FILE): mkdir -p $(DL_DIR) - $(WGET) -P $(DL_DIR) $(PKG_SOURCE_SITE)/$(PKG_SOURCE_FILE) + $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE_FILE) x $(PKG_SOURCE_SITE) $(PKG_BUILD_DIR)/.patched: $(DL_DIR)/$(PKG_SOURCE_FILE) mkdir -p $(TOOL_BUILD_DIR) -- cgit v1.2.3 From df1d9706f4e8dc21c18dd210c16cef8620ca7efe Mon Sep 17 00:00:00 2001 From: wbx Date: Mon, 21 Mar 2005 08:12:49 +0000 Subject: add md5sums git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@405 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/libpcap/Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'package/libpcap/Makefile') diff --git a/package/libpcap/Makefile b/package/libpcap/Makefile index 6d0dfafe7..e9276367b 100644 --- a/package/libpcap/Makefile +++ b/package/libpcap/Makefile @@ -1,8 +1,11 @@ +# $Id$ + include $(TOPDIR)/rules.mk 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 @@ -10,10 +13,9 @@ PKG_SOURCE_CAT := zcat PKG_SOURCE_DIR := $(PKG_NAME)-$(PKG_VERSION) PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_SOURCE_DIR) - $(DL_DIR)/$(PKG_SOURCE_FILE): mkdir -p $(DL_DIR) - $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE_FILE) x $(PKG_SOURCE_SITE) + $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE_FILE) $(PKG_MD5SUM) $(PKG_SOURCE_SITE) $(PKG_BUILD_DIR)/.patched: $(DL_DIR)/$(PKG_SOURCE_FILE) mkdir -p $(TOOL_BUILD_DIR) @@ -57,4 +59,3 @@ install: clean: rm -rf $(PKG_BUILD_DIR) rm -f $(STAGING_DIR)/lib/libpcap* - -- cgit v1.2.3 From b4e465c6fbdab58ae67827e034483a7003846fd4 Mon Sep 17 00:00:00 2001 From: nico Date: Wed, 30 Mar 2005 14:43:56 +0000 Subject: Make libpcap shared git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@476 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/libpcap/Makefile | 52 ++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 41 insertions(+), 11 deletions(-) (limited to 'package/libpcap/Makefile') diff --git a/package/libpcap/Makefile b/package/libpcap/Makefile index e9276367b..98806c283 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) -- cgit v1.2.3 From 52f3809489073694ff4af026783ebfcebad0b1c2 Mon Sep 17 00:00:00 2001 From: nico Date: Wed, 30 Mar 2005 15:31:23 +0000 Subject: Fix libpcap compile git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@477 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/libpcap/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/libpcap/Makefile') diff --git a/package/libpcap/Makefile b/package/libpcap/Makefile index 98806c283..1980429d8 100644 --- a/package/libpcap/Makefile +++ b/package/libpcap/Makefile @@ -80,7 +80,7 @@ $(IPKG_STATE_DIR)/info/$(PKG_NAME).list: $(PKG_IPK) source: $(DL_DIR)/$(PKG_SOURCE_FILE) prepare: $(PKG_BUILD_DIR)/.patched -compile: $(STAGING_DIR)/lib/libpcap.a +compile: $(STAGING_DIR)/usr/lib/libpcap.a install: $(IPKG_STATE_DIR)/info/$(PKG_NAME).list clean: -- cgit v1.2.3 From da0520760c404d28e435344774d27742f86d18ac Mon Sep 17 00:00:00 2001 From: nbd Date: Fri, 1 Apr 2005 16:49:24 +0000 Subject: build libpcap package git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@504 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/libpcap/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/libpcap/Makefile') diff --git a/package/libpcap/Makefile b/package/libpcap/Makefile index 1980429d8..e9144a6cf 100644 --- a/package/libpcap/Makefile +++ b/package/libpcap/Makefile @@ -80,7 +80,7 @@ $(IPKG_STATE_DIR)/info/$(PKG_NAME).list: $(PKG_IPK) source: $(DL_DIR)/$(PKG_SOURCE_FILE) prepare: $(PKG_BUILD_DIR)/.patched -compile: $(STAGING_DIR)/usr/lib/libpcap.a +compile: $(STAGING_DIR)/usr/lib/libpcap.a $(PKG_IPK) install: $(IPKG_STATE_DIR)/info/$(PKG_NAME).list clean: -- cgit v1.2.3 From 7e039b5de1a77684d3e8a8d78cebc6124e552c9f Mon Sep 17 00:00:00 2001 From: nico Date: Thu, 14 Apr 2005 06:17:27 +0000 Subject: Uniformize package Makefile, Build in a separate directory so that arpwatch and tcpdump configure wont find it git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@642 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/libpcap/Makefile | 87 +++++++++++++++++++++++++----------------------- 1 file changed, 46 insertions(+), 41 deletions(-) (limited to 'package/libpcap/Makefile') diff --git a/package/libpcap/Makefile b/package/libpcap/Makefile index e9144a6cf..974d9afc4 100644 --- a/package/libpcap/Makefile +++ b/package/libpcap/Makefile @@ -2,35 +2,39 @@ include $(TOPDIR)/rules.mk -PKG_NAME := libpcap -PKG_VERSION := 0.8.3 -PKG_RELEASE := 1 -PKG_MD5SUM := 56a9d4615d8354fcfe8cff8c8443c77b +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_IPK := $(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk -PKG_IPK_DIR:=$(PKG_BUILD_DIR)/ipkg +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 -$(DL_DIR)/$(PKG_SOURCE_FILE): - mkdir -p $(DL_DIR) - $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE_FILE) $(PKG_MD5SUM) $(PKG_SOURCE_SITE) +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)/$(PKG_NAME)-$(PKG_VERSION) -$(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) - +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 + +$(DL_DIR)/$(PKG_SOURCE): + $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) $(PKG_MD5SUM) $(PKG_SOURCE_URL) + +$(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)/.patched + touch $(PKG_BUILD_DIR)/.prepared -$(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)/.configured: $(PKG_BUILD_DIR)/.prepared + (cd $(PKG_BUILD_DIR); rm -rf config.cache config.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) \ @@ -49,6 +53,8 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.patched --mandir=/usr/share/man \ --sbindir=/usr/sbin \ --sysconfdir=/etc \ + $(DISABLE_NLS) \ + $(DISABLE_LARGEFILE) \ --enable-shared \ --enable-static \ --disable-yydebug \ @@ -57,35 +63,34 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.patched ); touch $(PKG_BUILD_DIR)/.configured -$(PKG_BUILD_DIR)/libpcap.a: $(PKG_BUILD_DIR)/.configured +$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured $(MAKE) -C $(PKG_BUILD_DIR) \ - $(TARGET_CONFIGURE_OPTS) \ - CCOPT="$(TARGET_CFLAGS)" \ + CCOPT="$(TARGET_CFLAGS)" + touch $(PKG_BUILD_DIR)/.built -$(STAGING_DIR)/usr/lib/libpcap.a: $(PKG_BUILD_DIR)/libpcap.a +$(STAGING_DIR)/usr/lib/libpcap.so: $(PKG_BUILD_DIR)/.built $(MAKE) -C $(PKG_BUILD_DIR) \ 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/* +$(IPKG_LIBPCAP): $(STAGING_DIR)/usr/lib/libpcap.so + $(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_LIBPCAP) $(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) + mkdir -p $(IDIR_LIBPCAP)/usr/lib + cp -fpR $(STAGING_DIR)/usr/lib/libpcap.so.* $(IDIR_LIBPCAP)/usr/lib/ + $(STRIP) $(IDIR_LIBPCAP)/usr/lib/lib*.so* mkdir -p $(PACKAGE_DIR) - $(IPKG_BUILD) $(PKG_IPK_DIR) $(PACKAGE_DIR) + $(IPKG_BUILD) $(IDIR_LIBPCAP) $(PACKAGE_DIR) -$(IPKG_STATE_DIR)/info/$(PKG_NAME).list: $(PKG_IPK) - $(IPKG) install $(PKG_IPK) +$(INFO_LIBPCAP): $(IPKG_LIBPCAP) + $(IPKG) install $(IPKG_LIBPCAP) -source: $(DL_DIR)/$(PKG_SOURCE_FILE) -prepare: $(PKG_BUILD_DIR)/.patched -compile: $(STAGING_DIR)/usr/lib/libpcap.a $(PKG_IPK) -install: $(IPKG_STATE_DIR)/info/$(PKG_NAME).list +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 clean - rm -rf $(PKG_BUILD_DIR) - rm -f $(PKG_IPK) + uninstall + rm -rf $(PKG_BUILD_DIR) $(IPKG_LIBPCAP) -- cgit v1.2.3 From 8d0bb89ddba5b4f2d33fc36f4dbfd9022c2f7051 Mon Sep 17 00:00:00 2001 From: nico Date: Mon, 18 Apr 2005 22:21:01 +0000 Subject: Change libpcap, uniformize package makefile, put back control file in ./ipkg git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@682 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/libpcap/Makefile | 56 ++++++++++++++++++++++++------------------------ 1 file changed, 28 insertions(+), 28 deletions(-) (limited to 'package/libpcap/Makefile') diff --git a/package/libpcap/Makefile b/package/libpcap/Makefile index 974d9afc4..0a0e5181f 100644 --- a/package/libpcap/Makefile +++ b/package/libpcap/Makefile @@ -29,37 +29,37 @@ $(PKG_BUILD_DIR)/.prepared: $(DL_DIR)/$(PKG_SOURCE) touch $(PKG_BUILD_DIR)/.prepared $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared - (cd $(PKG_BUILD_DIR); rm -rf config.cache config.status; \ + (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) \ - --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 \ + --with-build-cc=$(HOSTCC) \ + --with-pcap=linux \ ); touch $(PKG_BUILD_DIR)/.configured @@ -74,10 +74,10 @@ $(STAGING_DIR)/usr/lib/libpcap.so: $(PKG_BUILD_DIR)/.built install $(IPKG_LIBPCAP): $(STAGING_DIR)/usr/lib/libpcap.so - $(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_LIBPCAP) $(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) - mkdir -p $(IDIR_LIBPCAP)/usr/lib + $(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/ - $(STRIP) $(IDIR_LIBPCAP)/usr/lib/lib*.so* + $(RSTRIP) $(IDIR_LIBPCAP) mkdir -p $(PACKAGE_DIR) $(IPKG_BUILD) $(IDIR_LIBPCAP) $(PACKAGE_DIR) -- cgit v1.2.3 From 301a8eaf2c2a35b97b27f206eefa95403e323dcd Mon Sep 17 00:00:00 2001 From: nico Date: Fri, 13 May 2005 02:03:35 +0000 Subject: Convert libpcap to new packaging style git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@866 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/libpcap/Makefile | 50 +++++++++++++++++++----------------------------- 1 file changed, 20 insertions(+), 30 deletions(-) (limited to 'package/libpcap/Makefile') diff --git a/package/libpcap/Makefile b/package/libpcap/Makefile index 0a0e5181f..89f975344 100644 --- a/package/libpcap/Makefile +++ b/package/libpcap/Makefile @@ -14,19 +14,11 @@ 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) - -$(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 +$(eval $(call PKG_template,LIBPCAP,libpcap,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \ @@ -66,31 +58,29 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured $(MAKE) -C $(PKG_BUILD_DIR) \ CCOPT="$(TARGET_CFLAGS)" - touch $(PKG_BUILD_DIR)/.built - -$(STAGING_DIR)/usr/lib/libpcap.so: $(PKG_BUILD_DIR)/.built + mkdir -p $(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) \ - DESTDIR="$(STAGING_DIR)" \ + DESTDIR="$(PKG_INSTALL_DIR)" \ install + touch $(PKG_BUILD_DIR)/.built -$(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 -fpR $(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 -fpR $(PKG_INSTALL_DIR)/usr/include/pcap* $(STAGING_DIR)/usr/include/ + mkdir -p $(I_LIBPCAP_DEV)/usr/lib + cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libpcap.{a,so*} $(STAGING_DIR)/usr/lib/ + +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: install-dev +clean: uninstall-dev -- cgit v1.2.3 From 40f92c0d2a09ed23a6ce5bd40ff2ef637df73e8d Mon Sep 17 00:00:00 2001 From: nico Date: Fri, 13 May 2005 04:27:26 +0000 Subject: Fix typo git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@875 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/libpcap/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'package/libpcap/Makefile') diff --git a/package/libpcap/Makefile b/package/libpcap/Makefile index 89f975344..bedebf2c7 100644 --- a/package/libpcap/Makefile +++ b/package/libpcap/Makefile @@ -73,8 +73,9 @@ $(IPKG_LIBPCAP): $(STAGING_DIR)/usr/lib/libpcap.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include cp -fpR $(PKG_INSTALL_DIR)/usr/include/pcap* $(STAGING_DIR)/usr/include/ - mkdir -p $(I_LIBPCAP_DEV)/usr/lib + 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 -- cgit v1.2.3 From d2368294409098f0d160f5cf432c149aa3bd858f Mon Sep 17 00:00:00 2001 From: nico Date: Thu, 19 May 2005 21:14:18 +0000 Subject: Tweak package build git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@968 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/libpcap/Makefile | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'package/libpcap/Makefile') diff --git a/package/libpcap/Makefile b/package/libpcap/Makefile index bedebf2c7..908c364a1 100644 --- a/package/libpcap/Makefile +++ b/package/libpcap/Makefile @@ -7,9 +7,7 @@ PKG_VERSION:=0.8.3 PKG_RELEASE:=1 PKG_MD5SUM:=56a9d4615d8354fcfe8cff8c8443c77b -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 @@ -53,16 +51,16 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared --with-build-cc=$(HOSTCC) \ --with-pcap=linux \ ); - touch $(PKG_BUILD_DIR)/.configured + touch $@ $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured - $(MAKE) -C $(PKG_BUILD_DIR) \ - CCOPT="$(TARGET_CFLAGS)" + rm -rf $(PKG_INSTALL_DIR) mkdir -p $(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) \ + CCOPT="$(TARGET_CFLAGS)" \ DESTDIR="$(PKG_INSTALL_DIR)" \ - install - touch $(PKG_BUILD_DIR)/.built + all install + touch $@ $(IPKG_LIBPCAP): install -m0755 -d $(IDIR_LIBPCAP)/usr/lib -- cgit v1.2.3 From 6b53157103d462f7ea0b81f9fe77412719ea2260 Mon Sep 17 00:00:00 2001 From: nbd Date: Sat, 22 Oct 2005 12:12:59 +0000 Subject: lots of small package changes and dependency cleanups for the V= stuff git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2230 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/libpcap/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'package/libpcap/Makefile') diff --git a/package/libpcap/Makefile b/package/libpcap/Makefile index 908c364a1..fa79e7461 100644 --- a/package/libpcap/Makefile +++ b/package/libpcap/Makefile @@ -18,7 +18,7 @@ include $(TOPDIR)/package/rules.mk $(eval $(call PKG_template,LIBPCAP,libpcap,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(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)" \ @@ -53,7 +53,7 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared ); touch $@ -$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured +$(PKG_BUILD_DIR)/.built: rm -rf $(PKG_INSTALL_DIR) mkdir -p $(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) \ @@ -81,5 +81,5 @@ uninstall-dev: rm -rf $(STAGING_DIR)/usr/include/pcap* rm -rf $(STAGING_DIR)/usr/lib/libpcap.{a,so*} -compile: install-dev -clean: uninstall-dev +compile-targets: install-dev +clean-targets: uninstall-dev -- cgit v1.2.3 From 30bf34f05c0f66d9d9221f7ebfe9808024337dd4 Mon Sep 17 00:00:00 2001 From: nbd Date: Sat, 22 Oct 2005 22:03:56 +0000 Subject: add pf_ring patches for kernel and libpcap git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2266 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/libpcap/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/libpcap/Makefile') diff --git a/package/libpcap/Makefile b/package/libpcap/Makefile index fa79e7461..c7dfd9991 100644 --- a/package/libpcap/Makefile +++ b/package/libpcap/Makefile @@ -57,7 +57,7 @@ $(PKG_BUILD_DIR)/.built: 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 $@ -- cgit v1.2.3 From 0afac1c419d6e9c2f0878eb736a6de186f229fa5 Mon Sep 17 00:00:00 2001 From: wbx Date: Sun, 25 Dec 2005 04:28:19 +0000 Subject: enable ipv6, closes #129, bump release number git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2773 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/libpcap/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'package/libpcap/Makefile') diff --git a/package/libpcap/Makefile b/package/libpcap/Makefile index c7dfd9991..42bac4690 100644 --- a/package/libpcap/Makefile +++ b/package/libpcap/Makefile @@ -4,7 +4,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libpcap PKG_VERSION:=0.8.3 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_MD5SUM:=56a9d4615d8354fcfe8cff8c8443c77b PKG_SOURCE_URL:=http://www.tcpdump.org/release/ @@ -48,6 +48,7 @@ $(PKG_BUILD_DIR)/.configured: --enable-shared \ --enable-static \ --disable-yydebug \ + --enable-ipv6 \ --with-build-cc=$(HOSTCC) \ --with-pcap=linux \ ); -- cgit v1.2.3 From 82daa5e9c007b2a16aa9e8c5526fd8d034ee4541 Mon Sep 17 00:00:00 2001 From: mbm Date: Wed, 1 Feb 2006 23:53:19 +0000 Subject: change cp to $(CP) git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@3112 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/libpcap/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'package/libpcap/Makefile') diff --git a/package/libpcap/Makefile b/package/libpcap/Makefile index 42bac4690..670bca0cd 100644 --- a/package/libpcap/Makefile +++ b/package/libpcap/Makefile @@ -65,15 +65,15 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBPCAP): install -m0755 -d $(IDIR_LIBPCAP)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libpcap.so.* $(IDIR_LIBPCAP)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpcap.so.* $(IDIR_LIBPCAP)/usr/lib/ $(RSTRIP) $(IDIR_LIBPCAP) $(IPKG_BUILD) $(IDIR_LIBPCAP) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libpcap.so: $(PKG_BUILD_DIR)/.built 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* $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libpcap.{a,so*} $(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 -- cgit v1.2.3 From 2b02642832677bd2d7d089aaebedf36b897e7ac0 Mon Sep 17 00:00:00 2001 From: florian Date: Sun, 5 Feb 2006 17:30:49 +0000 Subject: Updated libpcap to 0.9.4, tcpdump to 3.9.4 git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@3139 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/libpcap/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'package/libpcap/Makefile') diff --git a/package/libpcap/Makefile b/package/libpcap/Makefile index 670bca0cd..67bc3f7fd 100644 --- a/package/libpcap/Makefile +++ b/package/libpcap/Makefile @@ -3,9 +3,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libpcap -PKG_VERSION:=0.8.3 -PKG_RELEASE:=2 -PKG_MD5SUM:=56a9d4615d8354fcfe8cff8c8443c77b +PKG_VERSION:=0.9.4 +PKG_RELEASE:=1 +PKG_MD5SUM:=79025766e8027df154cb1f32de8a7974 PKG_SOURCE_URL:=http://www.tcpdump.org/release/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -- cgit v1.2.3 From 737022a15e9e7b872ffd8220604f29c6e4bc399d Mon Sep 17 00:00:00 2001 From: nbd Date: Thu, 13 Apr 2006 22:20:15 +0000 Subject: remove lots of non-essential packages git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3641 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/libpcap/Makefile | 86 ------------------------------------------------ 1 file changed, 86 deletions(-) delete mode 100644 package/libpcap/Makefile (limited to 'package/libpcap/Makefile') diff --git a/package/libpcap/Makefile b/package/libpcap/Makefile deleted file mode 100644 index 67bc3f7fd..000000000 --- a/package/libpcap/Makefile +++ /dev/null @@ -1,86 +0,0 @@ -# $Id$ - -include $(TOPDIR)/rules.mk - -PKG_NAME:=libpcap -PKG_VERSION:=0.9.4 -PKG_RELEASE:=1 -PKG_MD5SUM:=79025766e8027df154cb1f32de8a7974 - -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 - -include $(TOPDIR)/package/rules.mk - -$(eval $(call PKG_template,LIBPCAP,libpcap,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) - -$(PKG_BUILD_DIR)/.configured: - (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) \ - --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 $@ - -$(PKG_BUILD_DIR)/.built: - rm -rf $(PKG_INSTALL_DIR) - mkdir -p $(PKG_INSTALL_DIR) - $(MAKE) -C $(PKG_BUILD_DIR) \ - CCOPT="$(TARGET_CFLAGS) -I$(BUILD_DIR)/linux/include" \ - DESTDIR="$(PKG_INSTALL_DIR)" \ - all install - touch $@ - -$(IPKG_LIBPCAP): - install -m0755 -d $(IDIR_LIBPCAP)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpcap.so.* $(IDIR_LIBPCAP)/usr/lib/ - $(RSTRIP) $(IDIR_LIBPCAP) - $(IPKG_BUILD) $(IDIR_LIBPCAP) $(PACKAGE_DIR) - -$(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 - -uninstall-dev: - rm -rf $(STAGING_DIR)/usr/include/pcap* - rm -rf $(STAGING_DIR)/usr/lib/libpcap.{a,so*} - -compile-targets: install-dev -clean-targets: uninstall-dev -- cgit v1.2.3 From a8f632da6583439bddf8b41341f2d4f51ae884bb Mon Sep 17 00:00:00 2001 From: nico Date: Wed, 24 May 2006 07:18:36 +0000 Subject: import libpcap from trunk and convert it to -ng. git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3825 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/libpcap/Makefile | 97 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 97 insertions(+) create mode 100644 package/libpcap/Makefile (limited to 'package/libpcap/Makefile') diff --git a/package/libpcap/Makefile b/package/libpcap/Makefile new file mode 100644 index 000000000..960caf133 --- /dev/null +++ b/package/libpcap/Makefile @@ -0,0 +1,97 @@ +# $Id$ + +include $(TOPDIR)/rules.mk + +PKG_NAME:=libpcap +PKG_VERSION:=0.9.4 +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_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install + +include $(TOPDIR)/package/rules.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/ +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 \ + ); +endef + +define Build/Compile + rm -rf $(PKG_INSTALL_DIR) + mkdir -p $(PKG_INSTALL_DIR) + $(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/ +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* +endef + +$(eval $(call BuildPackage,libpcap)) -- cgit v1.2.3 From 4e00d98efdec5bb2e6e19eccf85fcf9a0eecb646 Mon Sep 17 00:00:00 2001 From: nico Date: Sun, 18 Jun 2006 18:30:40 +0000 Subject: normalize Makefiles. git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3998 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/libpcap/Makefile | 34 ++++++++++++++-------------------- 1 file changed, 14 insertions(+), 20 deletions(-) (limited to 'package/libpcap/Makefile') diff --git a/package/libpcap/Makefile b/package/libpcap/Makefile index 960caf133..d4d7e2167 100644 --- a/package/libpcap/Makefile +++ b/package/libpcap/Makefile @@ -17,11 +17,11 @@ PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install include $(TOPDIR)/package/rules.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:=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 define Build/Configure @@ -69,29 +69,23 @@ define Build/Compile 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 \ + $(CP) $(PKG_INSTALL_DIR)/usr/include/pcap{,-bpf,-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* \ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpcap.{a,so*} \ $(STAGING_DIR)/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* + rm -rf $(STAGING_DIR)/usr/include/pcap{,-bpf,-named}.h \ + $(STAGING_DIR)/usr/lib/libpcap.{a,so*} +endef + +define Package/libpcap/install + install -m0755 -d $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpcap.so.* $(1)/usr/lib/ endef $(eval $(call BuildPackage,libpcap)) -- cgit v1.2.3 From 859e8f7f7d8bfbefd610d338d16498190cd51e15 Mon Sep 17 00:00:00 2001 From: nbd Date: Wed, 21 Jun 2006 02:16:37 +0000 Subject: build system cleanup. move shared include files into $(TOPDIR)/include, move lzma, mkfs.* into toolchain/ git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4032 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/libpcap/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/libpcap/Makefile') diff --git a/package/libpcap/Makefile b/package/libpcap/Makefile index d4d7e2167..2d7aecf55 100644 --- a/package/libpcap/Makefile +++ b/package/libpcap/Makefile @@ -14,7 +14,7 @@ PKG_CAT:=zcat PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install -include $(TOPDIR)/package/rules.mk +include $(TOPDIR)/include/package.mk define Package/libpcap SECTION:=base -- cgit v1.2.3 From 0b0afa4d818ec18187b09055fbb8d84a01590d6e Mon Sep 17 00:00:00 2001 From: nbd Date: Wed, 21 Jun 2006 02:32:39 +0000 Subject: add INCLUDE_DIR variable for $(TOPDIR)/include git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4033 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/libpcap/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/libpcap/Makefile') diff --git a/package/libpcap/Makefile b/package/libpcap/Makefile index 2d7aecf55..0ded09a90 100644 --- a/package/libpcap/Makefile +++ b/package/libpcap/Makefile @@ -14,7 +14,7 @@ PKG_CAT:=zcat PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install -include $(TOPDIR)/include/package.mk +include $(INCLUDE_DIR)/package.mk define Package/libpcap SECTION:=base -- cgit v1.2.3 From 02cdebbb91a33d8e24da1c94a9d93ac39be168a7 Mon Sep 17 00:00:00 2001 From: mbm Date: Tue, 27 Jun 2006 00:35:46 +0000 Subject: credit where credit is due git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4091 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/libpcap/Makefile | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'package/libpcap/Makefile') diff --git a/package/libpcap/Makefile b/package/libpcap/Makefile index 0ded09a90..76c88af9c 100644 --- a/package/libpcap/Makefile +++ b/package/libpcap/Makefile @@ -1,3 +1,9 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# # $Id$ include $(TOPDIR)/rules.mk -- cgit v1.2.3 From 8b379ad6296f23d04b8a73b70d6a88cb78634244 Mon Sep 17 00:00:00 2001 From: mbm Date: Fri, 4 Aug 2006 03:26:32 +0000 Subject: add quotes to TARGET_CC and TARGET_CROSS to help with distcc and ccache git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4429 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/libpcap/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/libpcap/Makefile') diff --git a/package/libpcap/Makefile b/package/libpcap/Makefile index 76c88af9c..1d9d4371f 100644 --- a/package/libpcap/Makefile +++ b/package/libpcap/Makefile @@ -61,7 +61,7 @@ define Build/Configure --enable-static \ --disable-yydebug \ --enable-ipv6 \ - --with-build-cc=$(HOSTCC) \ + --with-build-cc="$(HOSTCC)" \ --with-pcap=linux \ ); endef -- cgit v1.2.3 From 001227b7800328fe3db15d62e0948d25dfa596f6 Mon Sep 17 00:00:00 2001 From: mbm Date: Fri, 4 Aug 2006 05:30:27 +0000 Subject: more cleanup (make sure to pass TARGET_PATH and not just TARGET_CC) git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4432 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/libpcap/Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'package/libpcap/Makefile') diff --git a/package/libpcap/Makefile b/package/libpcap/Makefile index 1d9d4371f..155748a47 100644 --- a/package/libpcap/Makefile +++ b/package/libpcap/Makefile @@ -71,6 +71,7 @@ define Build/Compile mkdir -p $(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) \ CCOPT="$(TARGET_CFLAGS) -I$(BUILD_DIR)/linux/include" \ + PATH=$(TARGET_PATH) \ DESTDIR="$(PKG_INSTALL_DIR)" \ all install endef -- cgit v1.2.3 From ef998d64e381ed0a92fc73edf4206f7be7335caf Mon Sep 17 00:00:00 2001 From: mbm Date: Fri, 4 Aug 2006 11:59:52 +0000 Subject: set PATH in rules.mk git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4438 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/libpcap/Makefile | 1 - 1 file changed, 1 deletion(-) (limited to 'package/libpcap/Makefile') diff --git a/package/libpcap/Makefile b/package/libpcap/Makefile index 155748a47..1d9d4371f 100644 --- a/package/libpcap/Makefile +++ b/package/libpcap/Makefile @@ -71,7 +71,6 @@ define Build/Compile mkdir -p $(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) \ CCOPT="$(TARGET_CFLAGS) -I$(BUILD_DIR)/linux/include" \ - PATH=$(TARGET_PATH) \ DESTDIR="$(PKG_INSTALL_DIR)" \ all install endef -- cgit v1.2.3 From 46d9b2065a012d0e95ff0285854d4fdde0904d6b Mon Sep 17 00:00:00 2001 From: nico Date: Sat, 23 Sep 2006 19:29:00 +0000 Subject: standardize Makefile, change section from base to libs git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4842 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/libpcap/Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'package/libpcap/Makefile') diff --git a/package/libpcap/Makefile b/package/libpcap/Makefile index 1d9d4371f..4fd1acae1 100644 --- a/package/libpcap/Makefile +++ b/package/libpcap/Makefile @@ -23,11 +23,13 @@ PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install include $(INCLUDE_DIR)/package.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 + DESCRIPTION:=\ + This package contains a system-independent library for user-level \\\ + network packet capture. + URL:=http://www.tcpdump.org/ endef define Build/Configure @@ -67,8 +69,6 @@ define Build/Configure endef define Build/Compile - rm -rf $(PKG_INSTALL_DIR) - mkdir -p $(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) \ CCOPT="$(TARGET_CFLAGS) -I$(BUILD_DIR)/linux/include" \ DESTDIR="$(PKG_INSTALL_DIR)" \ -- cgit v1.2.3 From 8afb23270d23db6a033ba8fb77e1cf1a1d925a7c Mon Sep 17 00:00:00 2001 From: nico Date: Sun, 24 Sep 2006 20:49:31 +0000 Subject: new (last?) attempt at standardizing Makefiles git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4855 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/libpcap/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/libpcap/Makefile') diff --git a/package/libpcap/Makefile b/package/libpcap/Makefile index 4fd1acae1..f8de02d55 100644 --- a/package/libpcap/Makefile +++ b/package/libpcap/Makefile @@ -12,12 +12,12 @@ PKG_NAME:=libpcap PKG_VERSION:=0.9.4 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_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)/$(PKG_NAME)-$(PKG_VERSION) PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install include $(INCLUDE_DIR)/package.mk -- cgit v1.2.3