public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in net-analyzer/nfdump/files: nfdump-1.5.8-parallel.patch
@ 2009-05-11 16:12 Peter Volkov (pva)
  0 siblings, 0 replies; 3+ messages in thread
From: Peter Volkov (pva) @ 2009-05-11 16:12 UTC (permalink / raw
  To: gentoo-commits

pva         09/05/11 16:12:39

  Added:                nfdump-1.5.8-parallel.patch
  Log:
  Version bump. Fixed parallel build issue, bug #240746, thank Diego E. 'Flameeyes' Pettenò for report.
  (Portage version: 2.2_rc33/cvs/Linux i686)

Revision  Changes    Path
1.1                  net-analyzer/nfdump/files/nfdump-1.5.8-parallel.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/nfdump/files/nfdump-1.5.8-parallel.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/nfdump/files/nfdump-1.5.8-parallel.patch?rev=1.1&content-type=text/plain

Index: nfdump-1.5.8-parallel.patch
===================================================================
=== 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)
 
-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)
 
 nfgen: nfgen.o
@@ -90,7 +90,7 @@
 nfprofile: $(NFPROF_OBJ)
 	$(CC) $(CFLAGS) $(INCS) -o $@ $(NFPROF_OBJ) $(LDFLAGS) $(LIBS) $(RRD_LIBS)
 
-nfreplay: $(NFRPLY_OBJ)
+nfreplay: $(NFRPLY_OBJ) grammar.h
 	$(CC) $(CFLAGS) $(INCS) -o $@ $(NFRPLY_OBJ) $(LDFLAGS) $(LIBS)
 
 nfexpire: $(NFEXPR_OBJ)







^ permalink raw reply	[flat|nested] 3+ messages in thread

* [gentoo-commits] gentoo-x86 commit in net-analyzer/nfdump/files: nfdump-1.5.8-parallel.patch
@ 2009-07-09 15:10 Peter Volkov (pva)
  0 siblings, 0 replies; 3+ messages in thread
From: Peter Volkov (pva) @ 2009-07-09 15:10 UTC (permalink / raw
  To: gentoo-commits

pva         09/07/09 15:10:30

  Modified:             nfdump-1.5.8-parallel.patch
  Log:
  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)

Revision  Changes    Path
1.2                  net-analyzer/nfdump/files/nfdump-1.5.8-parallel.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/nfdump/files/nfdump-1.5.8-parallel.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/nfdump/files/nfdump-1.5.8-parallel.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/nfdump/files/nfdump-1.5.8-parallel.patch?r1=1.1&r2=1.2

Index: nfdump-1.5.8-parallel.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/nfdump/files/nfdump-1.5.8-parallel.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nfdump-1.5.8-parallel.patch	11 May 2009 16:12:39 -0000	1.1
+++ nfdump-1.5.8-parallel.patch	9 Jul 2009 15:10:30 -0000	1.2
@@ -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)
-






^ permalink raw reply	[flat|nested] 3+ messages in thread

* [gentoo-commits] gentoo-x86 commit in net-analyzer/nfdump/files: nfdump-1.5.8-parallel.patch
@ 2010-07-12 21:41 Jeroen Roovers (jer)
  0 siblings, 0 replies; 3+ messages in thread
From: Jeroen Roovers (jer) @ 2010-07-12 21:41 UTC (permalink / raw
  To: gentoo-commits

jer         10/07/12 21:41:08

  Removed:              nfdump-1.5.8-parallel.patch
  Log:
  Old.
  (Portage version: 2.2_rc67/cvs/Linux i686)



^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2010-07-12 21:41 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-05-11 16:12 [gentoo-commits] gentoo-x86 commit in net-analyzer/nfdump/files: nfdump-1.5.8-parallel.patch Peter Volkov (pva)
  -- strict thread matches above, loose matches on Subject: below --
2009-07-09 15:10 Peter Volkov (pva)
2010-07-12 21:41 Jeroen Roovers (jer)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox