diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2005-04-28 21:55:21 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2005-04-28 21:55:21 +0000 |
| commit | c7075be717c899823159c65c21a8ba594ada34fb (patch) | |
| tree | ebf90eba50710653ed885aed5b077e0e8465faa6 | |
| parent | 2f9cdb0230b0c7cac44e99d0446987efba25e05d (diff) | |
remove undocumented pcap debug flag in tcpdump to make compile work with gcc 3.4
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@753 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/tcpdump/Makefile | 6 | ||||
| -rw-r--r-- | package/tcpdump/patches/remove-pcap-debug.patch | 24 |
2 files changed, 27 insertions, 3 deletions
diff --git a/package/tcpdump/Makefile b/package/tcpdump/Makefile index cf74ea5f17..d174d2fedd 100644 --- a/package/tcpdump/Makefile +++ b/package/tcpdump/Makefile @@ -13,7 +13,7 @@ PKG_SOURCE_URL:= \ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_CAT:=zcat -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)/$(PKG_NAME)-$(PKG_VERSION) +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) IPKG_TCPDUMP:=$(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk IDIR_TCPDUMP:=$(PKG_BUILD_DIR)/ipkg/$(PKG_NAME) @@ -23,8 +23,8 @@ $(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) - + $(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - + $(PATCH) $(PKG_BUILD_DIR) ./patches touch $(PKG_BUILD_DIR)/.prepared $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared diff --git a/package/tcpdump/patches/remove-pcap-debug.patch b/package/tcpdump/patches/remove-pcap-debug.patch new file mode 100644 index 0000000000..7a0c9c3c21 --- /dev/null +++ b/package/tcpdump/patches/remove-pcap-debug.patch @@ -0,0 +1,24 @@ +diff -urN tcpdump-3.8.3.old/tcpdump.c tcpdump-3.8.3.dev/tcpdump.c +--- tcpdump-3.8.3.old/tcpdump.c 2004-03-17 20:47:48.000000000 +0100 ++++ tcpdump-3.8.3.dev/tcpdump.c 2005-04-29 00:53:20.000000000 +0200 +@@ -596,20 +596,6 @@ + error("invalid data link type %s", dlt_name); + break; + +-#if defined(HAVE_PCAP_DEBUG) || defined(HAVE_YYDEBUG) +- case 'Y': +- { +- /* Undocumented flag */ +-#ifdef HAVE_PCAP_DEBUG +- extern int pcap_debug; +- pcap_debug = 1; +-#else +- extern int yydebug; +- yydebug = 1; +-#endif +- } +- break; +-#endif + default: + usage(); + /* NOTREACHED */ |