1 |
jer 10/09/10 05:14:31 |
2 |
|
3 |
Modified: traffic-vis-0.35-gentoo.patch |
4 |
Log: |
5 |
Use pkg-config instead of glib-config. Fix parallel make. Respect LDFLAGS (bug #336570) and CC. |
6 |
|
7 |
(Portage version: 2.2_rc78/cvs/Linux i686) |
8 |
|
9 |
Revision Changes Path |
10 |
1.2 net-analyzer/traffic-vis/files/traffic-vis-0.35-gentoo.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/traffic-vis/files/traffic-vis-0.35-gentoo.patch?rev=1.2&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/traffic-vis/files/traffic-vis-0.35-gentoo.patch?rev=1.2&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/traffic-vis/files/traffic-vis-0.35-gentoo.patch?r1=1.1&r2=1.2 |
15 |
|
16 |
Index: traffic-vis-0.35-gentoo.patch |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/traffic-vis/files/traffic-vis-0.35-gentoo.patch,v |
19 |
retrieving revision 1.1 |
20 |
retrieving revision 1.2 |
21 |
diff -u -r1.1 -r1.2 |
22 |
--- traffic-vis-0.35-gentoo.patch 30 Oct 2003 00:17:12 -0000 1.1 |
23 |
+++ traffic-vis-0.35-gentoo.patch 10 Sep 2010 05:14:31 -0000 1.2 |
24 |
@@ -1,5 +1,5 @@ |
25 |
---- frontends/htmlfe.c |
26 |
-+++ frontends/htmlfe.c 2003-06-20 07:07:17.000000000 +0000 |
27 |
+--- a/frontends/htmlfe.c |
28 |
++++ b/frontends/htmlfe.c |
29 |
@@ -188,7 +188,7 @@ |
30 |
<TD ALIGN=\"RIGHT\">\n\ |
31 |
%llu\n\ |
32 |
@@ -9,8 +9,8 @@ |
33 |
", host->bytes_sent, host->bytes_received); |
34 |
|
35 |
fprintf(out, "\ |
36 |
---- frontends/traffic-togif |
37 |
-+++ frontends/traffic-togif 2003-10-23 19:29:30.000000000 +0000 |
38 |
+--- a/frontends/traffic-togif |
39 |
++++ b/frontends/traffic-togif |
40 |
@@ -31,7 +31,7 @@ |
41 |
my $y_size = 750; |
42 |
|
43 |
@@ -20,8 +20,50 @@ |
44 |
my $pnmcrop = "/usr/bin/pnmcrop"; |
45 |
my $pnmscale = "/usr/bin/pnmscale"; |
46 |
my $ppmtogif = "/usr/bin/ppmtogif"; |
47 |
---- collector/Makefile |
48 |
-+++ collector/Makefile 2003-10-23 19:45:52.000000000 +0000 |
49 |
+--- a/Makefile 2003-06-20 09:07:17.000000000 +0200 |
50 |
++++ b/Makefile 2010-09-10 06:53:46.000000000 +0200 |
51 |
+@@ -7,11 +7,11 @@ |
52 |
+ OPT_FLAGS=$(RPM_OPT_FLAGS) |
53 |
+ WARNFLAGS=-Wall -Wno-conversion -Waggregate-return -Wmissing-prototypes -Wstrict-prototypes |
54 |
+ DEBUGFLAGS=-g #-DDEBUG |
55 |
+-INCLUDES=-I/usr/include/pcap `glib-config --cflags` |
56 |
++INCLUDES=-I/usr/include/pcap `pkg-config --cflags glib-2.0` |
57 |
+ DEFINES= -DHAVE_GETOPT_LONG |
58 |
+ CFLAGS+= -DVERSION="\"$(VERSION)"\" $(DEFINES) $(WARNFLAGS) $(DEBUGFLAGS) $(INCLUDES) $(OPT_FLAGS) |
59 |
+ LFLAGS= |
60 |
+-GLIB=`glib-config --libs` |
61 |
++GLIB=`pkg-config --libs glib-2.0` |
62 |
+ #GLIB=/usr/lib/libglib.a |
63 |
+ #DEBUGLIBS=-lefence |
64 |
+ |
65 |
+@@ -25,7 +25,7 @@ |
66 |
+ all: $(TARGETS) |
67 |
+ for x in $(SUBDIRS) ; \ |
68 |
+ do \ |
69 |
+- make -C $$x \ |
70 |
++ $(MAKE) -C $$x \ |
71 |
+ VERSION="$(VERSION)" OPT_FLAGS="$(OPT_FLAGS)" \ |
72 |
+ WARNFLAGS="$(WARNFLAGS)" INCLUDES="$(INCLUDES)" \ |
73 |
+ DEFINES="$(DEFINES)" GLIB="$(GLIB)" \ |
74 |
+@@ -38,7 +38,7 @@ |
75 |
+ install: |
76 |
+ for x in $(SUBDIRS) ; \ |
77 |
+ do \ |
78 |
+- make -C $$x SBINDIR="$(SBINDIR)" MANDIR="$(MANDIR)" install || exit 1; \ |
79 |
++ $(MAKE) -C $$x SBINDIR="$(SBINDIR)" MANDIR="$(MANDIR)" install || exit 1; \ |
80 |
+ done |
81 |
+ install -m 644 -o root -g root traffic-vis.8 $(MANDIR)/man8/ |
82 |
+ |
83 |
+@@ -46,6 +46,6 @@ |
84 |
+ rm -f *.o core ~* *.a *.ps *.txt *.html test test.o *.tv |
85 |
+ for x in $(SUBDIRS) ; \ |
86 |
+ do \ |
87 |
+- (cd $$x && make clean && cd ..) ; \ |
88 |
++ (cd $$x && $(MAKE) clean && cd ..) ; \ |
89 |
+ done |
90 |
+ |
91 |
+--- a/collector/Makefile 1999-02-11 04:23:50.000000000 +0100 |
92 |
++++ b/collector/Makefile 2010-09-10 06:53:46.000000000 +0200 |
93 |
@@ -1,4 +1,4 @@ |
94 |
-CFLAGS= -DVERSION="\"$(VERSION)"\" $(DEFINES) $(WARNFLAGS) $(DEBUGFLAGS) $(INCLUDES) -I.. $(OPT_FLAGS) |
95 |
+CFLAGS+= -DVERSION="\"$(VERSION)"\" $(DEFINES) $(WARNFLAGS) $(DEBUGFLAGS) $(INCLUDES) -I.. $(OPT_FLAGS) |
96 |
@@ -33,12 +75,12 @@ |
97 |
|
98 |
traffic-collector: traffic-collector.o $(OBJS) |
99 |
- $(CC) -o $@ traffic-collector.o $(OBJS) $(LIBS) |
100 |
-+ $(CC) $(CFLAGS) -o $@ traffic-collector.o $(OBJS) $(LIBS) |
101 |
++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ traffic-collector.o $(OBJS) $(LIBS) |
102 |
|
103 |
install: |
104 |
install -m 750 -o root -g root traffic-collector $(SBINDIR) |
105 |
---- frontends/Makefile |
106 |
-+++ frontends/Makefile 2003-10-23 19:48:02.000000000 +0000 |
107 |
+--- a/frontends/Makefile 1999-02-11 04:23:50.000000000 +0100 |
108 |
++++ b/frontends/Makefile 2010-09-10 06:53:46.000000000 +0200 |
109 |
@@ -1,4 +1,4 @@ |
110 |
-CFLAGS= -DVERSION="\"$(VERSION)\"" $(DEFINES) $(WARNFLAGS) $(DEBUGFLAGS) $(INCLUDES) -I.. $(OPT_FLAGS) |
111 |
+CFLAGS+= -DVERSION="\"$(VERSION)\"" $(DEFINES) $(WARNFLAGS) $(DEBUGFLAGS) $(INCLUDES) -I.. $(OPT_FLAGS) |
112 |
@@ -50,37 +92,40 @@ |
113 |
|
114 |
traffic-tops: traffic-tops.o psfe.o ../libreport.a |
115 |
- $(CC) -o $@ traffic-tops.o psfe.o $(LFLAGS) $(LIBS) -lm |
116 |
-+ $(CC) $(CFLAGS) -o $@ traffic-tops.o psfe.o $(LFLAGS) $(LIBS) -lm |
117 |
++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ traffic-tops.o psfe.o $(LFLAGS) $(LIBS) -lm |
118 |
|
119 |
traffic-totext: traffic-totext.o textfe.o ../libreport.a |
120 |
- $(CC) -o $@ traffic-totext.o textfe.o $(LFLAGS) $(LIBS) |
121 |
-+ $(CC) $(CFLAGS) -o $@ traffic-totext.o textfe.o $(LFLAGS) $(LIBS) |
122 |
++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ traffic-totext.o textfe.o $(LFLAGS) $(LIBS) |
123 |
|
124 |
traffic-tohtml: traffic-tohtml.o htmlfe.o ../libreport.a |
125 |
- $(CC) -o $@ traffic-tohtml.o htmlfe.o $(LFLAGS) $(LIBS) |
126 |
-+ $(CC) $(CFLAGS) -o $@ traffic-tohtml.o htmlfe.o $(LFLAGS) $(LIBS) |
127 |
++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ traffic-tohtml.o htmlfe.o $(LFLAGS) $(LIBS) |
128 |
|
129 |
install: |
130 |
install -m 755 -o root -g root traffic-tops $(SBINDIR) |
131 |
---- sort/Makefile |
132 |
-+++ sort/Makefile 2003-10-23 19:49:11.000000000 +0000 |
133 |
-@@ -1,4 +1,4 @@ |
134 |
+--- a/sort/Makefile 1999-02-11 04:23:50.000000000 +0100 |
135 |
++++ b/sort/Makefile 2010-09-10 06:56:39.000000000 +0200 |
136 |
+@@ -1,13 +1,13 @@ |
137 |
-CFLAGS= -DVERSION="\"$(VERSION)\"" $(DEFINES) $(WARNFLAGS) $(DEBUGFLAGS) $(INCLUDES) -I.. $(OPT_FLAGS) |
138 |
+CFLAGS+= -DVERSION="\"$(VERSION)\"" $(DEFINES) $(WARNFLAGS) $(DEBUGFLAGS) $(INCLUDES) -I.. $(OPT_FLAGS) |
139 |
OBJS= |
140 |
TARGETS=traffic-sort |
141 |
- LFLAGS=-L.. |
142 |
-@@ -7,7 +7,7 @@ |
143 |
+-LFLAGS=-L.. |
144 |
+-LIBS=-lreport $(GLIB) $(DEBUGLIBS) |
145 |
++LFLAGS= |
146 |
++LIBS=-L.. -lreport $(GLIB) $(DEBUGLIBS) |
147 |
+ |
148 |
all: $(TARGETS) |
149 |
|
150 |
traffic-sort: traffic-sort.o ../libreport.a |
151 |
- $(CC) $(LFLAGS) -o $@ traffic-sort.o $(LIBS) |
152 |
-+ $(CC) $(CFLAGS) $(LFLAGS) -o $@ traffic-sort.o $(LIBS) |
153 |
++ $(CC) $(CFLAGS) $(LDFLAGS) $(LFLAGS) -o $@ traffic-sort.o $(LIBS) |
154 |
|
155 |
install: |
156 |
install -m 755 -o root -g root traffic-sort $(SBINDIR) |
157 |
---- utils/Makefile |
158 |
-+++ utils/Makefile 2003-10-23 19:50:48.000000000 +0000 |
159 |
+--- a/utils/Makefile 1999-02-11 04:23:50.000000000 +0100 |
160 |
++++ b/utils/Makefile 2010-09-10 06:53:46.000000000 +0200 |
161 |
@@ -1,4 +1,4 @@ |
162 |
-CFLAGS= -DVERSION="\"$(VERSION)\"" $(DEFINES) $(WARNFLAGS) $(DEBUGFLAGS) $(INCLUDES) -I.. $(OPT_FLAGS) |
163 |
+CFLAGS+= -DVERSION="\"$(VERSION)\"" $(DEFINES) $(WARNFLAGS) $(DEBUGFLAGS) $(INCLUDES) -I.. $(OPT_FLAGS) |
164 |
@@ -92,11 +137,11 @@ |
165 |
|
166 |
traffic-exclude: traffic-exclude.o ../libreport.a |
167 |
- $(CC) -o $@ traffic-exclude.o $(LFLAGS) $(LIBS) |
168 |
-+ $(CC) $(CFLAGS) -o $@ traffic-exclude.o $(LFLAGS) $(LIBS) |
169 |
++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ traffic-exclude.o $(LFLAGS) $(LIBS) |
170 |
|
171 |
traffic-resolve: traffic-resolve.o ../libreport.a |
172 |
- $(CC) -o $@ traffic-resolve.o $(LFLAGS) $(LIBS) |
173 |
-+ $(CC) $(CFLAGS) -o $@ traffic-resolve.o $(LFLAGS) $(LIBS) |
174 |
++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ traffic-resolve.o $(LFLAGS) $(LIBS) |
175 |
|
176 |
install: |
177 |
install -m 755 -o root -g root traffic-resolve $(SBINDIR) |