summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Volkov <pva@gentoo.org>2009-07-09 15:10:30 +0000
committerPeter Volkov <pva@gentoo.org>2009-07-09 15:10:30 +0000
commitcb3211726929adfb6cec7bd2d2212a10c5463792 (patch)
tree62df93a1e5c6d1e070290e10c8245a80407e0b11 /net-analyzer
parentForce <net-libs/xulrunner-1.9.1 wrt #258917 by nirbheek. (diff)
downloadgentoo-2-cb3211726929adfb6cec7bd2d2212a10c5463792.tar.gz
gentoo-2-cb3211726929adfb6cec7bd2d2212a10c5463792.tar.bz2
gentoo-2-cb3211726929adfb6cec7bd2d2212a10c5463792.zip
Updated parallel build failure patch so finally it really fixed, bug #270072 thank Kevin Pyle for this work.
(Portage version: 2.2_rc33/cvs/Linux i686)
Diffstat (limited to 'net-analyzer')
-rw-r--r--net-analyzer/nfdump/ChangeLog7
-rw-r--r--net-analyzer/nfdump/files/nfdump-1.5.8-parallel.patch30
2 files changed, 17 insertions, 20 deletions
diff --git a/net-analyzer/nfdump/ChangeLog b/net-analyzer/nfdump/ChangeLog
index 08aae09fc97c..7053167c42df 100644
--- a/net-analyzer/nfdump/ChangeLog
+++ b/net-analyzer/nfdump/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for net-analyzer/nfdump
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nfdump/ChangeLog,v 1.7 2009/05/11 16:12:38 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nfdump/ChangeLog,v 1.8 2009/07/09 15:10:29 pva Exp $
+
+ 09 Jul 2009; Peter Volkov <pva@gentoo.org>
+ files/nfdump-1.5.8-parallel.patch:
+ Updated parallel build failure patch so finally it really fixed, bug
+ #270072 thank Kevin Pyle for this work.
*nfdump-1.5.8 (11 May 2009)
diff --git a/net-analyzer/nfdump/files/nfdump-1.5.8-parallel.patch b/net-analyzer/nfdump/files/nfdump-1.5.8-parallel.patch
index cdd238777af9..98c5ed87d3f7 100644
--- a/net-analyzer/nfdump/files/nfdump-1.5.8-parallel.patch
+++ b/net-analyzer/nfdump/files/nfdump-1.5.8-parallel.patch
@@ -1,22 +1,14 @@
-=== modified file 'Makefile.in'
---- Makefile.in 2009-05-11 15:55:07 +0000
-+++ Makefile.in 2009-05-11 15:57:22 +0000
-@@ -78,7 +78,7 @@
- sfcapd: $(SFCAPD_OBJ)
- $(CC) $(CFLAGS) -o $@ $(SFCAPD_OBJ) $(LDFLAGS) $(LIBS)
+diff -ur a/Makefile.in b/Makefile.in
+--- a/Makefile.in 2009-05-17 15:10:24.000000000 -0500
++++ b/Makefile.in 2009-05-17 15:12:33.000000000 -0500
+@@ -72,6 +72,10 @@
--nftest: nftest.o $(COMMON_OBJ) $(FILTER_OBJ)
-+nftest: nftest.o grammar.h $(COMMON_OBJ) $(FILTER_OBJ)
- $(CC) $(CFLAGS) $(INCS) -o $@ nftest.o $(COMMON_OBJ) $(FILTER_OBJ) $(LDFLAGS) $(LIBS)
+ all: $(OBJECTS)
- nfgen: nfgen.o
-@@ -90,7 +90,7 @@
- nfprofile: $(NFPROF_OBJ)
- $(CC) $(CFLAGS) $(INCS) -o $@ $(NFPROF_OBJ) $(LDFLAGS) $(LIBS) $(RRD_LIBS)
++nfreplay.o: grammar.h
++
++nftree.o: grammar.h
++
+ nfcapd: $(NFCAPD_OBJ)
+ $(CC) $(CFLAGS) -o $@ $(NFCAPD_OBJ) $(LDFLAGS) $(LIBS)
--nfreplay: $(NFRPLY_OBJ)
-+nfreplay: $(NFRPLY_OBJ) grammar.h
- $(CC) $(CFLAGS) $(INCS) -o $@ $(NFRPLY_OBJ) $(LDFLAGS) $(LIBS)
-
- nfexpire: $(NFEXPR_OBJ)
-