1 |
bicatali 08/05/29 18:55:34 |
2 |
|
3 |
Added: xrootd-20071116-gcc43.patch |
4 |
root-5.18.00d-gcc43.patch |
5 |
root-5.18.00d-makefile.patch |
6 |
xrootd-20071116-checksymbol.patch |
7 |
Log: |
8 |
Version bump. This version is includes patches from upstream (included in sources), some local gcc-4.3 patches and various xrootd patches. Now works with afs on amd64. Removed cint7 flag as it is still too buggy, added xrootd use flag, added a math flag triggering all math libraries (mathcore, mathmore, minuit2, roofit, unuran). Much cleanup: qt-4.4 ready, removed afterimage dependency (will be back in 5.20). This version should be targeted for stabilization. |
9 |
(Portage version: 2.1.5.2) |
10 |
|
11 |
Revision Changes Path |
12 |
1.1 sci-physics/root/files/xrootd-20071116-gcc43.patch |
13 |
|
14 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-physics/root/files/xrootd-20071116-gcc43.patch?rev=1.1&view=markup |
15 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-physics/root/files/xrootd-20071116-gcc43.patch?rev=1.1&content-type=text/plain |
16 |
|
17 |
Index: xrootd-20071116-gcc43.patch |
18 |
=================================================================== |
19 |
--- xrootd/src/Xrd/XrdConfig.cc.orig 2008-01-29 06:38:09.000000000 +0000 |
20 |
+++ xrootd/src/Xrd/XrdConfig.cc 2008-05-26 11:18:26.736398449 +0000 |
21 |
@@ -21,7 +21,6 @@ |
22 |
|
23 |
#include <unistd.h> |
24 |
#include <ctype.h> |
25 |
-#include <iostream.h> |
26 |
#include <pwd.h> |
27 |
#include <string.h> |
28 |
#include <stdio.h> |
29 |
@@ -29,7 +28,8 @@ |
30 |
#include <sys/resource.h> |
31 |
#include <sys/types.h> |
32 |
#include <sys/stat.h> |
33 |
- |
34 |
+#include <iostream> |
35 |
+using namespace std; |
36 |
#include "Xrd/XrdBuffer.hh" |
37 |
#include "Xrd/XrdConfig.hh" |
38 |
#include "Xrd/XrdInet.hh" |
39 |
--- xrootd/src/Xrd/XrdMain.cc.orig 2007-07-31 02:23:35.000000000 +0000 |
40 |
+++ xrootd/src/Xrd/XrdMain.cc 2008-05-26 11:18:26.864405743 +0000 |
41 |
@@ -46,13 +46,14 @@ |
42 |
#include <unistd.h> |
43 |
#include <ctype.h> |
44 |
#include <errno.h> |
45 |
-#include <iostream.h> |
46 |
#include <signal.h> |
47 |
#include <stdlib.h> |
48 |
#include <string.h> |
49 |
#include <strings.h> |
50 |
#include <stdio.h> |
51 |
#include <sys/param.h> |
52 |
+#include <iostream> |
53 |
+using namespace std; |
54 |
|
55 |
#include "Xrd/XrdBuffer.hh" |
56 |
#include "Xrd/XrdConfig.hh" |
57 |
--- xrootd/src/Xrd/XrdTrace.hh.orig 2004-08-30 07:16:52.000000000 +0000 |
58 |
+++ xrootd/src/Xrd/XrdTrace.hh 2008-05-26 11:18:26.784401184 +0000 |
59 |
@@ -26,7 +26,7 @@ |
60 |
|
61 |
#ifndef NODEBUG |
62 |
|
63 |
-#include <iostream.h> |
64 |
+#include <iostream> |
65 |
#include "XrdOuc/XrdOucTrace.hh" |
66 |
|
67 |
#ifndef XRD_TRACE |
68 |
--- xrootd/src/XrdAcc/XrdAccConfig.cc.orig 2007-07-31 02:24:01.000000000 +0000 |
69 |
+++ xrootd/src/XrdAcc/XrdAccConfig.cc 2008-05-26 11:18:31.644678155 +0000 |
70 |
@@ -23,13 +23,14 @@ |
71 |
#include <unistd.h> |
72 |
#include <ctype.h> |
73 |
#include <fcntl.h> |
74 |
-#include <iostream.h> |
75 |
#include <strings.h> |
76 |
#include <stdio.h> |
77 |
#include <time.h> |
78 |
#include <sys/param.h> |
79 |
#include <sys/stat.h> |
80 |
#include <sys/types.h> |
81 |
+#include <iostream> |
82 |
+using namespace std; |
83 |
|
84 |
#include "XrdOuc/XrdOucLock.hh" |
85 |
#include "XrdOuc/XrdOucEnv.hh" |
86 |
--- xrootd/src/XrdAcc/XrdAccGroups.cc.orig 2004-07-07 02:47:55.000000000 +0000 |
87 |
+++ xrootd/src/XrdAcc/XrdAccGroups.cc 2008-05-26 11:18:31.540672229 +0000 |
88 |
@@ -15,7 +15,6 @@ |
89 |
#include <unistd.h> |
90 |
#include <ctype.h> |
91 |
#include <errno.h> |
92 |
-#include <iostream.h> |
93 |
#include <limits.h> |
94 |
#include <netdb.h> |
95 |
#include <pwd.h> |
96 |
@@ -23,6 +22,8 @@ |
97 |
#include <strings.h> |
98 |
#include <sys/param.h> |
99 |
#include <sys/types.h> |
100 |
+#include <iostream> |
101 |
+using namespace std; |
102 |
|
103 |
#include "XrdAcc/XrdAccCapability.hh" |
104 |
#include "XrdAcc/XrdAccGroups.hh" |
105 |
--- xrootd/src/XrdAcc/XrdAccTest.cc.orig 2007-07-31 02:24:03.000000000 +0000 |
106 |
+++ xrootd/src/XrdAcc/XrdAccTest.cc 2008-05-26 11:18:31.576674280 +0000 |
107 |
@@ -28,7 +28,6 @@ |
108 |
#include <unistd.h> |
109 |
#include <ctype.h> |
110 |
#include <errno.h> |
111 |
-#include <iostream.h> |
112 |
#include <stdlib.h> |
113 |
#include <strings.h> |
114 |
#include <stdio.h> |
115 |
@@ -36,6 +35,8 @@ |
116 |
#include <arpa/inet.h> |
117 |
#include <sys/param.h> |
118 |
#include <sys/socket.h> |
119 |
+#include <iostream> |
120 |
+using namespace std; |
121 |
|
122 |
#include "XrdAcc/XrdAccAuthorize.hh" |
123 |
#include "XrdAcc/XrdAccConfig.hh" |
124 |
--- xrootd/src/XrdClient/XrdClientPhyConnection.cc.orig 2007-12-06 15:04:21.000000000 +0000 |
125 |
+++ xrootd/src/XrdClient/XrdClientPhyConnection.cc 2008-05-26 11:18:24.896293587 +0000 |
126 |
@@ -220,14 +220,14 @@ |
127 |
Error("PhyConnection", |
128 |
"Can't create reader thread: out of system resources"); |
129 |
// HELP: what do we do here |
130 |
- std::exit(-1); |
131 |
+ ::exit(-1); |
132 |
} |
133 |
|
134 |
if (fReaderthreadhandler[i]->Run(this)) { |
135 |
Error("PhyConnection", |
136 |
"Can't run reader thread: out of system resources. Critical error."); |
137 |
// HELP: what do we do here |
138 |
- std::exit(-1); |
139 |
+ ::exit(-1); |
140 |
} |
141 |
|
142 |
if (fReaderthreadhandler[i]->Detach()) |
143 |
--- xrootd/src/XrdCrypto/XrdCryptoAux.hh.orig 2006-09-28 22:39:57.000000000 +0000 |
144 |
+++ xrootd/src/XrdCrypto/XrdCryptoAux.hh 2008-05-26 11:18:29.344547078 +0000 |
145 |
@@ -3,9 +3,7 @@ |
146 |
#define __CRYPTO_AUX_H__ |
147 |
|
148 |
#include <stdio.h> |
149 |
-#ifndef WIN32 |
150 |
-#include <iostream.h> |
151 |
-#endif |
152 |
+#include <iostream> |
153 |
#include <XProtocol/XProtocol.hh> |
154 |
|
155 |
/******************************************************************************/ |
156 |
--- xrootd/src/XrdCrypto/XrdCryptoCipher.cc.orig 2005-06-16 12:17:17.000000000 +0000 |
157 |
+++ xrootd/src/XrdCrypto/XrdCryptoCipher.cc 2008-05-26 11:18:29.052530437 +0000 |
158 |
@@ -19,6 +19,7 @@ |
159 |
|
160 |
#include <XrdCrypto/XrdCryptoAux.hh> |
161 |
#include <XrdCrypto/XrdCryptoCipher.hh> |
162 |
+using namespace std; |
163 |
|
164 |
//_____________________________________________________________________________ |
165 |
bool XrdCryptoCipher::Finalize(char *, int, const char *) |
166 |
--- xrootd/src/XrdCrypto/XrdCryptoMsgDigest.cc.orig 2005-06-16 12:17:18.000000000 +0000 |
167 |
+++ xrootd/src/XrdCrypto/XrdCryptoMsgDigest.cc 2008-05-26 11:18:28.904522003 +0000 |
168 |
@@ -18,6 +18,7 @@ |
169 |
/* ************************************************************************** */ |
170 |
|
171 |
#include <string.h> |
172 |
+using namespace std; |
173 |
|
174 |
#include <XrdCrypto/XrdCryptoAux.hh> |
175 |
#include <XrdCrypto/XrdCryptoMsgDigest.hh> |
176 |
--- xrootd/src/XrdCrypto/XrdCryptosslTrace.hh.orig 2005-06-16 12:17:23.000000000 +0000 |
177 |
+++ xrootd/src/XrdCrypto/XrdCryptosslTrace.hh 2008-05-26 11:18:29.220540012 +0000 |
178 |
@@ -16,7 +16,7 @@ |
179 |
|
180 |
#ifndef NODEBUG |
181 |
|
182 |
-#include <iostream.h> |
183 |
+#include <iostream> |
184 |
|
185 |
#define QTRACE(act) (sslTrace && (sslTrace->What & cryptoTRACE_ ## act)) |
186 |
#define PRINT(y) {if (sslTrace) {sslTrace->Beg(epname); \ |
187 |
--- xrootd/src/XrdCrypto/XrdCryptoTrace.hh.orig 2006-01-19 21:05:07.000000000 +0000 |
188 |
+++ xrootd/src/XrdCrypto/XrdCryptoTrace.hh 2008-05-26 11:18:29.036529526 +0000 |
189 |
@@ -16,7 +16,7 @@ |
190 |
|
191 |
#ifndef NODEBUG |
192 |
|
193 |
-#include <iostream.h> |
194 |
+#include <iostream> |
195 |
|
196 |
#define QTRACE(act) (cryptoTrace && (cryptoTrace->What & cryptoTRACE_ ## act)) |
197 |
#define PRINT(y) {if (cryptoTrace) {cryptoTrace->Beg(epname); \ |
198 |
--- xrootd/src/XrdNet/XrdNetDNS.cc.orig 2007-07-26 15:18:18.000000000 +0000 |
199 |
+++ xrootd/src/XrdNet/XrdNetDNS.cc 2008-05-26 11:18:31.200652852 +0000 |
200 |
@@ -24,8 +24,9 @@ |
201 |
#include <sys/socket.h> |
202 |
#include <netinet/in.h> |
203 |
#include <arpa/inet.h> |
204 |
-#include <iostream.h> |
205 |
#endif |
206 |
+#include <iostream> |
207 |
+using namespace std; |
208 |
|
209 |
#include "XrdNet/XrdNetDNS.hh" |
210 |
#include "XrdSys/XrdSysPlatform.hh" |
211 |
--- xrootd/src/XrdOdc/XrdOdcConfig.cc.orig 2007-07-31 02:24:52.000000000 +0000 |
212 |
+++ xrootd/src/XrdOdc/XrdOdcConfig.cc 2008-05-26 11:18:21.136079305 +0000 |
213 |
@@ -14,7 +14,6 @@ |
214 |
|
215 |
#include <unistd.h> |
216 |
#include <ctype.h> |
217 |
-#include <iostream.h> |
218 |
#include <strings.h> |
219 |
#include <stdio.h> |
220 |
#include <sys/param.h> |
221 |
@@ -23,6 +22,8 @@ |
222 |
#include <sys/stat.h> |
223 |
#include <sys/un.h> |
224 |
#include <fcntl.h> |
225 |
+#include <iostream> |
226 |
+using namespace std; |
227 |
|
228 |
#include "XrdOdc/XrdOdcConfig.hh" |
229 |
#include "XrdOdc/XrdOdcMsg.hh" |
230 |
--- xrootd/src/XrdOdc/XrdOdcTrace.hh.orig 2004-08-30 07:16:55.000000000 +0000 |
231 |
+++ xrootd/src/XrdOdc/XrdOdcTrace.hh 2008-05-26 11:18:21.040073834 +0000 |
232 |
@@ -23,7 +23,9 @@ |
233 |
|
234 |
#ifndef NODEBUG |
235 |
|
236 |
-#include <iostream.h> |
237 |
+#include <iostream> |
238 |
+using namespace std; |
239 |
+ |
240 |
#include "XrdOuc/XrdOucTrace.hh" |
241 |
|
242 |
#define QTRACE(act) OdcTrace.What & TRACE_ ## act |
243 |
--- xrootd/src/XrdOfs/XrdOfs.cc.orig 2007-11-15 22:24:14.000000000 +0000 |
244 |
+++ xrootd/src/XrdOfs/XrdOfs.cc 2008-05-26 11:18:32.120705283 +0000 |
245 |
@@ -35,13 +35,14 @@ |
246 |
#include <string.h> |
247 |
#include <stdio.h> |
248 |
#include <time.h> |
249 |
-#include <iostream.h> |
250 |
#include <netdb.h> |
251 |
#include <stdlib.h> |
252 |
#include <sys/param.h> |
253 |
#include <sys/stat.h> |
254 |
#include <sys/time.h> |
255 |
#include <sys/types.h> |
256 |
+#include <iostream> |
257 |
+using namespace std; |
258 |
|
259 |
#include "XrdVersion.hh" |
260 |
|
261 |
--- xrootd/src/XrdOfs/XrdOfsConfig.cc.orig 2007-10-04 01:33:34.000000000 +0000 |
262 |
+++ xrootd/src/XrdOfs/XrdOfsConfig.cc 2008-05-26 11:18:31.972696848 +0000 |
263 |
@@ -26,13 +26,14 @@ |
264 |
#include <ctype.h> |
265 |
#include <errno.h> |
266 |
#include <fcntl.h> |
267 |
-#include <iostream.h> |
268 |
#include <netdb.h> |
269 |
#include <stdlib.h> |
270 |
#include <strings.h> |
271 |
#include <stdio.h> |
272 |
#include <netinet/in.h> |
273 |
#include <sys/param.h> |
274 |
+#include <iostream> |
275 |
+using namespace std; |
276 |
|
277 |
#include "XrdOfs/XrdOfs.hh" |
278 |
#include "XrdOfs/XrdOfsConfig.hh" |
279 |
--- xrootd/src/XrdOfs/XrdOfsTrace.hh.orig 2004-08-30 07:16:57.000000000 +0000 |
280 |
+++ xrootd/src/XrdOfs/XrdOfsTrace.hh 2008-05-26 11:18:32.028700040 +0000 |
281 |
@@ -14,7 +14,7 @@ |
282 |
|
283 |
#ifndef NODEBUG |
284 |
|
285 |
-#include <iostream.h> |
286 |
+#include <iostream> |
287 |
#include "XrdOfs/XrdOfs.hh" |
288 |
|
289 |
#define GTRACE(act) OfsTrace.What & TRACE_ ## act |
290 |
--- xrootd/src/XrdOlb/XrdOlbConfig.cc.orig 2007-11-09 21:31:37.000000000 +0000 |
291 |
+++ xrootd/src/XrdOlb/XrdOlbConfig.cc 2008-05-26 11:18:22.924181203 +0000 |
292 |
@@ -25,7 +25,6 @@ |
293 |
#include <unistd.h> |
294 |
#include <ctype.h> |
295 |
#include <fcntl.h> |
296 |
-#include <iostream.h> |
297 |
#include <strings.h> |
298 |
#include <stdio.h> |
299 |
#include <sys/param.h> |
300 |
@@ -34,6 +33,8 @@ |
301 |
#include <sys/types.h> |
302 |
#include <sys/un.h> |
303 |
#include <dirent.h> |
304 |
+#include <iostream> |
305 |
+using namespace std; |
306 |
|
307 |
#include "../XrdVersion.hh" |
308 |
#include "Xrd/XrdJob.hh" |
309 |
--- xrootd/src/XrdOlb/XrdOlbProtocol.cc.orig 2007-11-09 21:31:38.000000000 +0000 |
310 |
+++ xrootd/src/XrdOlb/XrdOlbProtocol.cc 2008-05-26 11:18:23.088190549 +0000 |
311 |
@@ -16,13 +16,14 @@ |
312 |
#include <unistd.h> |
313 |
#include <ctype.h> |
314 |
#include <errno.h> |
315 |
-#include <iostream.h> |
316 |
#include <signal.h> |
317 |
#include <stdlib.h> |
318 |
#include <string.h> |
319 |
#include <strings.h> |
320 |
#include <stdio.h> |
321 |
#include <sys/param.h> |
322 |
+#include <iostream> |
323 |
+using namespace std; |
324 |
|
325 |
#include "Xrd/XrdInet.hh" |
326 |
#include "Xrd/XrdLink.hh" |
327 |
--- xrootd/src/XrdOlb/XrdOlbTrace.hh.orig 2007-07-31 02:25:18.000000000 +0000 |
328 |
+++ xrootd/src/XrdOlb/XrdOlbTrace.hh 2008-05-26 11:18:23.132193057 +0000 |
329 |
@@ -26,7 +26,7 @@ |
330 |
#define XRDOLBTRACETYPE . |
331 |
#endif |
332 |
|
333 |
-#include <iostream.h> |
334 |
+#include <iostream> |
335 |
#include "XrdOuc/XrdOucTrace.hh" |
336 |
|
337 |
#define DEBUG(y) if (Trace XRDOLBTRACETYPE What & TRACE_Debug) TRACEX(y) |
338 |
--- xrootd/src/XrdOss/XrdOssApi.cc.orig 2007-10-04 01:34:13.000000000 +0000 |
339 |
+++ xrootd/src/XrdOss/XrdOssApi.cc 2008-05-26 11:18:20.408037816 +0000 |
340 |
@@ -24,7 +24,6 @@ |
341 |
#include <unistd.h> |
342 |
#include <errno.h> |
343 |
#include <fcntl.h> |
344 |
-#include <iostream.h> |
345 |
#include <signal.h> |
346 |
#include <strings.h> |
347 |
#include <stdio.h> |
348 |
@@ -34,6 +33,8 @@ |
349 |
#ifdef __solaris__ |
350 |
#include <sys/vnode.h> |
351 |
#endif |
352 |
+#include <iostream> |
353 |
+using namespace std; |
354 |
|
355 |
#include "XrdVersion.hh" |
356 |
|
357 |
--- xrootd/src/XrdOss/XrdOssApi.hh.orig 2007-07-31 02:25:27.000000000 +0000 |
358 |
+++ xrootd/src/XrdOss/XrdOssApi.hh 2008-05-26 11:18:20.428038956 +0000 |
359 |
@@ -14,7 +14,7 @@ |
360 |
|
361 |
#include <sys/types.h> |
362 |
#include <errno.h> |
363 |
-#include <iostream.h> |
364 |
+#include <iostream> |
365 |
|
366 |
#include "XrdOss/XrdOss.hh" |
367 |
#include "XrdOss/XrdOssCache.hh" |
368 |
--- xrootd/src/XrdOss/XrdOssCache.cc.orig 2007-07-31 02:25:28.000000000 +0000 |
369 |
+++ xrootd/src/XrdOss/XrdOssCache.cc 2008-05-26 11:18:20.296031433 +0000 |
370 |
@@ -15,11 +15,12 @@ |
371 |
#include <unistd.h> |
372 |
#include <errno.h> |
373 |
#include <strings.h> |
374 |
-#include <iostream.h> |
375 |
#include <stdio.h> |
376 |
#include <time.h> |
377 |
#include <sys/types.h> |
378 |
#include <sys/stat.h> |
379 |
+#include <iostream> |
380 |
+using namespace std; |
381 |
|
382 |
#include "XrdOss/XrdOssApi.hh" |
383 |
#include "XrdOss/XrdOssCache.hh" |
384 |
--- xrootd/src/XrdOss/XrdOssConfig.cc 2007-11-09 21:32:41.000000000 +0000 |
385 |
+++ src/xrootd/src/XrdOss/XrdOssConfig.cc 2008-05-26 11:18:20.340033941 +0000 |
386 |
@@ -27,13 +27,14 @@ |
387 |
#include <ctype.h> |
388 |
#include <dirent.h> |
389 |
#include <fcntl.h> |
390 |
-#include <iostream.h> |
391 |
#include <strings.h> |
392 |
#include <stdio.h> |
393 |
#include <sys/param.h> |
394 |
#include <sys/resource.h> |
395 |
#include <sys/stat.h> |
396 |
#include <sys/types.h> |
397 |
+#include <iostream> |
398 |
+using namespace std; |
399 |
|
400 |
#include "XrdOss/XrdOssApi.hh" |
401 |
#include "XrdOss/XrdOssConfig.hh" |
402 |
--- xrootd/src/XrdOss/XrdOssCreate.cc.orig 2007-08-15 00:45:11.000000000 +0000 |
403 |
+++ xrootd/src/XrdOss/XrdOssCreate.cc 2008-05-26 11:18:20.272030065 +0000 |
404 |
@@ -19,7 +19,6 @@ |
405 |
#include <unistd.h> |
406 |
#include <errno.h> |
407 |
#include <fcntl.h> |
408 |
-#include <iostream.h> |
409 |
#include <strings.h> |
410 |
#include <stdio.h> |
411 |
#include <sys/file.h> |
412 |
@@ -28,6 +27,8 @@ |
413 |
#if defined(__solaris__) || defined(AIX) |
414 |
#include <sys/vnode.h> |
415 |
#endif |
416 |
+#include <iostream> |
417 |
+using namespace std; |
418 |
|
419 |
#include "XrdOss/XrdOssApi.hh" |
420 |
#include "XrdOss/XrdOssConfig.hh" |
421 |
--- xrootd/src/XrdOss/XrdOssLock.cc.orig 2007-07-31 02:25:31.000000000 +0000 |
422 |
+++ xrootd/src/XrdOss/XrdOssLock.cc 2008-05-26 11:18:20.140022543 +0000 |
423 |
@@ -68,11 +68,12 @@ |
424 |
#include <sys/types.h> |
425 |
#include <sys/wait.h> |
426 |
#include <errno.h> |
427 |
-#include <iostream.h> |
428 |
#include <fcntl.h> |
429 |
#include <limits.h> |
430 |
#include <strings.h> |
431 |
#include <utime.h> |
432 |
+#include <iostream> |
433 |
+using namespace std; |
434 |
|
435 |
#include "XrdOss/XrdOssApi.hh" |
436 |
#include "XrdOss/XrdOssConfig.hh" |
437 |
--- xrootd/src/XrdOss/XrdOssMSS.cc.orig 2007-07-31 02:25:32.000000000 +0000 |
438 |
+++ xrootd/src/XrdOss/XrdOssMSS.cc 2008-05-26 11:18:20.232027786 +0000 |
439 |
@@ -16,7 +16,6 @@ |
440 |
#include <unistd.h> |
441 |
#include <errno.h> |
442 |
#include <strings.h> |
443 |
-#include <iostream.h> |
444 |
#include <signal.h> |
445 |
#include <stdio.h> |
446 |
#include <time.h> |
447 |
@@ -29,6 +28,8 @@ |
448 |
#include <sys/socket.h> |
449 |
#include <sys/un.h> |
450 |
#include <sys/wait.h> |
451 |
+#include <iostream> |
452 |
+using namespace std; |
453 |
|
454 |
#include "XrdNet/XrdNetOpts.hh" |
455 |
#include "XrdNet/XrdNetSocket.hh" |
456 |
--- xrootd/src/XrdOss/XrdOssRename.cc.orig 2007-07-31 02:25:34.000000000 +0000 |
457 |
+++ xrootd/src/XrdOss/XrdOssRename.cc 2008-05-26 11:18:20.356034852 +0000 |
458 |
@@ -15,11 +15,12 @@ |
459 |
#include <unistd.h> |
460 |
#include <errno.h> |
461 |
#include <strings.h> |
462 |
-#include <iostream.h> |
463 |
#include <limits.h> |
464 |
#include <stdio.h> |
465 |
#include <sys/types.h> |
466 |
#include <sys/stat.h> |
467 |
+#include <iostream> |
468 |
+using namespace std; |
469 |
|
470 |
#include "XrdOss/XrdOssApi.hh" |
471 |
#include "XrdOss/XrdOssError.hh" |
472 |
--- xrootd/src/XrdOss/XrdOssStage.cc.orig 2007-07-31 02:25:34.000000000 +0000 |
473 |
+++ xrootd/src/XrdOss/XrdOssStage.cc 2008-05-26 11:18:20.316032573 +0000 |
474 |
@@ -25,13 +25,14 @@ |
475 |
#include <unistd.h> |
476 |
#include <errno.h> |
477 |
#include <strings.h> |
478 |
-#include <iostream.h> |
479 |
#include <signal.h> |
480 |
#include <stdio.h> |
481 |
#include <time.h> |
482 |
#include <sys/types.h> |
483 |
#include <sys/stat.h> |
484 |
#include <sys/wait.h> |
485 |
+#include <iostream> |
486 |
+using namespace std; |
487 |
|
488 |
#include "XrdOss/XrdOssApi.hh" |
489 |
#include "XrdOss/XrdOssCache.hh" |
490 |
--- xrootd/src/XrdOss/XrdOssTrace.hh.orig 2005-01-10 08:10:49.000000000 +0000 |
491 |
+++ xrootd/src/XrdOss/XrdOssTrace.hh 2008-05-26 11:18:20.384036448 +0000 |
492 |
@@ -24,7 +24,7 @@ |
493 |
|
494 |
#ifndef NODEBUG |
495 |
|
496 |
-#include <iostream.h> |
497 |
+#include <iostream> |
498 |
|
499 |
#define QTRACE(act) OssTrace.What & TRACE_ ## act |
500 |
|
501 |
--- xrootd/src/XrdOss/XrdOssUnlink.cc.orig 2007-08-09 01:18:46.000000000 +0000 |
502 |
+++ xrootd/src/XrdOss/XrdOssUnlink.cc 2008-05-26 11:18:20.216026874 +0000 |
503 |
@@ -15,11 +15,12 @@ |
504 |
#include <unistd.h> |
505 |
#include <errno.h> |
506 |
#include <strings.h> |
507 |
-#include <iostream.h> |
508 |
#include <limits.h> |
509 |
#include <stdio.h> |
510 |
#include <sys/types.h> |
511 |
#include <sys/stat.h> |
512 |
+#include <iostream> |
513 |
+using namespace std; |
514 |
|
515 |
#include "XrdOss/XrdOssApi.hh" |
516 |
#include "XrdOss/XrdOssError.hh" |
517 |
--- xrootd/src/XrdOuc/XrdOucStream.cc.orig 2008-01-14 11:25:06.000000000 +0000 |
518 |
+++ xrootd/src/XrdOuc/XrdOucStream.cc 2008-05-26 11:18:30.556616150 +0000 |
519 |
@@ -19,15 +19,11 @@ |
520 |
#include <string.h> |
521 |
#include <stdio.h> |
522 |
#ifndef WIN32 |
523 |
-#include <iostream.h> |
524 |
#include <unistd.h> |
525 |
#include <strings.h> |
526 |
#if !defined(__linux__) && !defined(__CYGWIN__) |
527 |
#include <sys/conf.h> |
528 |
#endif |
529 |
-#if !defined(__macos__) && !defined(__CYGWIN__) |
530 |
-#include <stropts.h> |
531 |
-#endif |
532 |
#include <sys/stat.h> |
533 |
#include <sys/termios.h> |
534 |
#include <sys/types.h> |
535 |
@@ -35,9 +31,9 @@ |
536 |
#else // WIN32 |
537 |
#include "XrdSys/XrdWin32.hh" |
538 |
#include <process.h> |
539 |
+#endif // WIN32 |
540 |
#include <iostream> |
541 |
using namespace std; |
542 |
-#endif // WIN32 |
543 |
|
544 |
#include "XrdOuc/XrdOucEnv.hh" |
545 |
#include "XrdOuc/XrdOucStream.hh" |
546 |
--- xrootd/src/XrdOuc/XrdOucTrace.hh.orig 2007-07-31 02:25:53.000000000 +0000 |
547 |
+++ xrootd/src/XrdOuc/XrdOucTrace.hh 2008-05-26 16:38:39.779442480 +0000 |
548 |
@@ -11,13 +11,8 @@ |
549 |
/******************************************************************************/ |
550 |
|
551 |
// $Id: xrootd-20071116-gcc43.patch,v 1.1 2008/05/29 18:55:34 bicatali Exp $ |
552 |
- |
553 |
-#ifndef WIN32 |
554 |
-#include <iostream.h> |
555 |
-#else |
556 |
#include <iostream> |
557 |
using namespace std; |
558 |
-#endif |
559 |
|
560 |
#include "XrdSys/XrdSysError.hh" |
561 |
|
562 |
--- xrootd/src/XrdPosix/XrdPosix.cc.orig 2007-07-28 00:25:25.000000000 +0000 |
563 |
+++ xrootd/src/XrdPosix/XrdPosix.cc 2008-05-26 11:18:18.119907423 +0000 |
564 |
@@ -18,7 +18,8 @@ |
565 |
#include <fcntl.h> |
566 |
#include <unistd.h> |
567 |
#include <sys/uio.h> |
568 |
-#include <iostream.h> |
569 |
+#include <iostream> |
570 |
+using namespace std; |
571 |
|
572 |
#include "XrdPosix/XrdPosixLinkage.hh" |
573 |
#include "XrdPosix/XrdPosixXrootd.hh" |
574 |
--- xrootd/src/XrdPosix/XrdPosixLinkage.cc.orig 2007-07-28 00:25:26.000000000 +0000 |
575 |
+++ xrootd/src/XrdPosix/XrdPosixLinkage.cc 2008-05-26 11:18:18.091905827 +0000 |
576 |
@@ -25,7 +25,8 @@ |
577 |
#if !defined(__macos__) && !defined(__CYGWIN__) |
578 |
#include <link.h> |
579 |
#endif |
580 |
-#include <iostream.h> |
581 |
+#include <iostream> |
582 |
+using namespace std; |
583 |
|
584 |
#include <errno.h> |
585 |
#include "XrdPosix/XrdPosixLinkage.hh" |
586 |
--- xrootd/src/XrdPosix/XrdPosixPreload32.cc.orig 2007-08-07 21:28:55.000000000 +0000 |
587 |
+++ xrootd/src/XrdPosix/XrdPosixPreload32.cc 2008-05-26 11:18:18.095906055 +0000 |
588 |
@@ -21,7 +21,8 @@ |
589 |
#include <sys/stat.h> |
590 |
#include <sys/types.h> |
591 |
#include <unistd.h> |
592 |
-#include <iostream.h> |
593 |
+#include <iostream> |
594 |
+using namespace std; |
595 |
|
596 |
#include "XrdPosix/XrdPosixExtern.hh" |
597 |
#include "XrdPosix/XrdPosixLinkage.hh" |
598 |
--- xrootd/src/XrdPosix/XrdPosixPreload.cc.orig 2007-07-28 00:25:27.000000000 +0000 |
599 |
+++ xrootd/src/XrdPosix/XrdPosixPreload.cc 2008-05-26 11:18:18.687939793 +0000 |
600 |
@@ -15,7 +15,8 @@ |
601 |
#include <sys/stat.h> |
602 |
#include <sys/types.h> |
603 |
#include <unistd.h> |
604 |
-#include <iostream.h> |
605 |
+#include <iostream> |
606 |
+using namespace std; |
607 |
|
608 |
#include "XrdPosix/XrdPosixExtern.hh" |
609 |
#include "XrdPosix/XrdPosixLinkage.hh" |
610 |
--- xrootd/src/XrdPss/XrdPss.cc.orig 2007-07-31 02:26:01.000000000 +0000 |
611 |
+++ xrootd/src/XrdPss/XrdPss.cc 2008-05-26 11:18:20.772058560 +0000 |
612 |
@@ -19,7 +19,6 @@ |
613 |
#include <unistd.h> |
614 |
#include <errno.h> |
615 |
#include <fcntl.h> |
616 |
-#include <iostream.h> |
617 |
#include <signal.h> |
618 |
#include <strings.h> |
619 |
#include <stdio.h> |
620 |
@@ -29,6 +28,8 @@ |
621 |
#ifdef __solaris__ |
622 |
#include <sys/vnode.h> |
623 |
#endif |
624 |
+#include <iostream> |
625 |
+using namespace std; |
626 |
|
627 |
#include "XrdVersion.hh" |
628 |
|
629 |
--- xrootd/src/XrdPss/XrdPssConfig.cc.orig 2007-07-31 02:26:02.000000000 +0000 |
630 |
+++ xrootd/src/XrdPss/XrdPssConfig.cc 2008-05-26 11:18:20.796059928 +0000 |
631 |
@@ -14,7 +14,6 @@ |
632 |
|
633 |
#include <unistd.h> |
634 |
#include <ctype.h> |
635 |
-#include <iostream.h> |
636 |
#include <strings.h> |
637 |
#include <stdio.h> |
638 |
#include <sys/param.h> |
639 |
@@ -23,6 +22,8 @@ |
640 |
#include <sys/stat.h> |
641 |
#include <sys/un.h> |
642 |
#include <fcntl.h> |
643 |
+#include <iostream> |
644 |
+using namespace std; |
645 |
|
646 |
#include "XrdPss/XrdPss.hh" |
647 |
#include "XrdOuc/XrdOuca2x.hh" |
648 |
--- xrootd/src/XrdPss/XrdPss.hh.orig 2007-07-31 02:26:02.000000000 +0000 |
649 |
+++ xrootd/src/XrdPss/XrdPss.hh 2008-05-26 11:18:20.760057876 +0000 |
650 |
@@ -14,7 +14,7 @@ |
651 |
|
652 |
#include <sys/types.h> |
653 |
#include <errno.h> |
654 |
-#include <iostream.h> |
655 |
+#include <iostream> |
656 |
|
657 |
#include "XrdOss/XrdOss.hh" |
658 |
|
659 |
--- xrootd/src/XrdSec/XrdSecClient.cc.orig 2007-07-26 15:18:31.000000000 +0000 |
660 |
+++ xrootd/src/XrdSec/XrdSecClient.cc 2008-05-26 11:18:21.460097769 +0000 |
661 |
@@ -15,7 +15,6 @@ |
662 |
#include <unistd.h> |
663 |
#include <ctype.h> |
664 |
#include <errno.h> |
665 |
-#include <iostream.h> |
666 |
#include <netdb.h> |
667 |
#include <stdlib.h> |
668 |
#include <strings.h> |
669 |
@@ -25,6 +24,8 @@ |
670 |
#include <sys/socket.h> |
671 |
#include <netinet/in.h> |
672 |
#include <arpa/inet.h> |
673 |
+#include <iostream> |
674 |
+using namespace std; |
675 |
|
676 |
#include "XrdOuc/XrdOucErrInfo.hh" |
677 |
#include "XrdSys/XrdSysPthread.hh" |
678 |
--- xrootd/src/XrdSec/XrdSecPManager.cc.orig 2006-01-26 02:02:10.000000000 +0000 |
679 |
+++ xrootd/src/XrdSec/XrdSecPManager.cc 2008-05-26 11:18:21.444096857 +0000 |
680 |
@@ -31,7 +31,8 @@ |
681 |
#include <sys/stat.h> |
682 |
#include <sys/types.h> |
683 |
#include <errno.h> |
684 |
-#include <iostream.h> |
685 |
+#include <iostream> |
686 |
+using namespace std; |
687 |
|
688 |
#include "XrdSec/XrdSecInterface.hh" |
689 |
#include "XrdSec/XrdSecPManager.hh" |
690 |
--- xrootd/src/XrdSec/XrdSecServer.cc.orig 2007-08-31 19:24:40.000000000 +0000 |
691 |
+++ xrootd/src/XrdSec/XrdSecServer.cc 2008-05-26 11:18:21.400094350 +0000 |
692 |
@@ -16,12 +16,13 @@ |
693 |
#include <ctype.h> |
694 |
#include <errno.h> |
695 |
#include <fcntl.h> |
696 |
-#include <iostream.h> |
697 |
#include <netdb.h> |
698 |
#include <stdlib.h> |
699 |
#include <strings.h> |
700 |
#include <stdio.h> |
701 |
#include <sys/param.h> |
702 |
+#include <iostream> |
703 |
+using namespace std; |
704 |
|
705 |
#include "XrdOuc/XrdOucEnv.hh" |
706 |
#include "XrdSys/XrdSysError.hh" |
707 |
--- xrootd/src/XrdSec/XrdSectestClient.cc.orig 2005-03-25 08:25:59.000000000 +0000 |
708 |
+++ xrootd/src/XrdSec/XrdSectestClient.cc 2008-05-26 11:18:21.472098453 +0000 |
709 |
@@ -20,7 +20,6 @@ |
710 |
#include <unistd.h> |
711 |
#include <ctype.h> |
712 |
#include <errno.h> |
713 |
-#include <iostream.h> |
714 |
#include <stdlib.h> |
715 |
#include <strings.h> |
716 |
#include <stdio.h> |
717 |
@@ -28,6 +27,8 @@ |
718 |
#include <arpa/inet.h> |
719 |
#include <sys/param.h> |
720 |
#include <sys/socket.h> |
721 |
+#include <iostream> |
722 |
+using namespace std; |
723 |
|
724 |
#include "XrdSec/XrdSecInterface.hh" |
725 |
|
726 |
--- xrootd/src/XrdSec/XrdSectestServer.cc.orig 2007-07-31 02:26:15.000000000 +0000 |
727 |
+++ xrootd/src/XrdSec/XrdSectestServer.cc 2008-05-26 11:18:21.412095034 +0000 |
728 |
@@ -15,7 +15,6 @@ |
729 |
#include <unistd.h> |
730 |
#include <ctype.h> |
731 |
#include <errno.h> |
732 |
-#include <iostream.h> |
733 |
#include <stdlib.h> |
734 |
#include <strings.h> |
735 |
#include <stdio.h> |
736 |
@@ -23,6 +22,8 @@ |
737 |
#include <arpa/inet.h> |
738 |
#include <sys/param.h> |
739 |
#include <sys/socket.h> |
740 |
+#include <iostream> |
741 |
+using namespace std; |
742 |
|
743 |
#include "XrdOuc/XrdOucErrInfo.hh" |
744 |
#include "XrdSys/XrdSysLogger.hh" |
745 |
--- xrootd/src/XrdSec/XrdSecTrace.hh.orig 2004-08-30 07:17:04.000000000 +0000 |
746 |
+++ xrootd/src/XrdSec/XrdSecTrace.hh 2008-05-26 11:18:21.412095034 +0000 |
747 |
@@ -16,7 +16,7 @@ |
748 |
|
749 |
#ifndef NODEBUG |
750 |
|
751 |
-#include <iostream.h> |
752 |
+#include <iostream> |
753 |
|
754 |
#define QTRACE(act) SecTrace->What & TRACE_ ## act |
755 |
|
756 |
--- xrootd/src/XrdSeckrb5/XrdSecProtocolkrb5.cc.orig 2007-07-26 15:18:35.000000000 +0000 |
757 |
+++ xrootd/src/XrdSeckrb5/XrdSecProtocolkrb5.cc 2008-05-26 11:18:36.856975187 +0000 |
758 |
@@ -18,7 +18,6 @@ |
759 |
#include <unistd.h> |
760 |
#include <ctype.h> |
761 |
#include <errno.h> |
762 |
-#include <iostream.h> |
763 |
#include <stdlib.h> |
764 |
#include <strings.h> |
765 |
#include <stdio.h> |
766 |
@@ -26,6 +25,8 @@ |
767 |
#include <pwd.h> |
768 |
#include <sys/types.h> |
769 |
#include <sys/stat.h> |
770 |
+#include <iostream> |
771 |
+using namespace std; |
772 |
|
773 |
extern "C" { |
774 |
#include "krb5.h" |
775 |
--- xrootd/src/XrdSecpwd/XrdSecProtocolpwd.cc.orig 2008-02-19 08:17:31.000000000 +0000 |
776 |
+++ xrootd/src/XrdSecpwd/XrdSecProtocolpwd.cc 2008-05-26 11:18:29.604561896 +0000 |
777 |
@@ -12,7 +12,6 @@ |
778 |
#include <unistd.h> |
779 |
#include <ctype.h> |
780 |
#include <errno.h> |
781 |
-#include <iostream.h> |
782 |
#include <stdlib.h> |
783 |
#include <strings.h> |
784 |
#include <stdio.h> |
785 |
@@ -22,6 +21,8 @@ |
786 |
#include <sys/stat.h> |
787 |
#include <fcntl.h> |
788 |
#include <sys/times.h> |
789 |
+#include <iostream> |
790 |
+using namespace std; |
791 |
|
792 |
// AFS support |
793 |
#ifdef R__AFS |
794 |
--- xrootd/src/XrdSecunix/XrdSecProtocolunix.cc.orig 2007-08-02 01:41:06.000000000 +0000 |
795 |
+++ xrootd/src/XrdSecunix/XrdSecProtocolunix.cc 2008-05-26 11:18:25.468326185 +0000 |
796 |
@@ -15,12 +15,13 @@ |
797 |
#include <unistd.h> |
798 |
#include <ctype.h> |
799 |
#include <errno.h> |
800 |
-#include <iostream.h> |
801 |
#include <stdlib.h> |
802 |
#include <strings.h> |
803 |
#include <grp.h> |
804 |
#include <pwd.h> |
805 |
#include <sys/types.h> |
806 |
+#include <iostream> |
807 |
+using namespace std; |
808 |
|
809 |
#include "XrdOuc/XrdOucErrInfo.hh" |
810 |
#include "XrdSys/XrdSysPthread.hh" |
811 |
--- xrootd/src/XrdSfs/XrdSfsNative.cc.orig 2007-10-04 01:34:19.000000000 +0000 |
812 |
+++ xrootd/src/XrdSfs/XrdSfsNative.cc 2008-05-26 11:18:36.652963561 +0000 |
813 |
@@ -20,10 +20,11 @@ |
814 |
#include <memory.h> |
815 |
#include <string.h> |
816 |
#include <stdio.h> |
817 |
-#include <iostream.h> |
818 |
#include <stdlib.h> |
819 |
#include <sys/param.h> |
820 |
#include <sys/stat.h> |
821 |
+#include <iostream> |
822 |
+using namespace std; |
823 |
|
824 |
#include "XrdVersion.hh" |
825 |
#include "XrdSys/XrdSysError.hh" |
826 |
--- xrootd/src/XrdSut/XrdSutAux.hh.orig 2008-02-19 08:17:32.000000000 +0000 |
827 |
+++ xrootd/src/XrdSut/XrdSutAux.hh 2008-05-26 11:18:22.096134015 +0000 |
828 |
@@ -11,9 +11,7 @@ |
829 |
/* DE-AC03-76-SFO0515 with the Department of Energy */ |
830 |
/******************************************************************************/ |
831 |
|
832 |
-#ifndef WIN32 |
833 |
-#include <iostream.h> |
834 |
-#endif |
835 |
+#include <iostream> |
836 |
#ifndef __XPROTOCOL_H |
837 |
#include <XProtocol/XProtocol.hh> |
838 |
#endif |
839 |
--- xrootd/src/XrdSut/XrdSutTrace.hh.orig 2005-06-16 12:28:32.000000000 +0000 |
840 |
+++ xrootd/src/XrdSut/XrdSutTrace.hh 2008-05-26 11:18:22.104134471 +0000 |
841 |
@@ -19,7 +19,7 @@ |
842 |
|
843 |
#ifndef NODEBUG |
844 |
|
845 |
-#include <iostream.h> |
846 |
+#include <iostream> |
847 |
|
848 |
#define QTRACE(act) (sutTrace && (sutTrace->What & sutTRACE_ ## act)) |
849 |
#define PRINT(y) {if (sutTrace) {sutTrace->Beg(epname); \ |
850 |
--- xrootd/src/XrdSys/XrdSysError.cc.orig 2007-07-31 02:26:44.000000000 +0000 |
851 |
+++ xrootd/src/XrdSys/XrdSysError.cc 2008-05-26 11:18:25.968354680 +0000 |
852 |
@@ -16,25 +16,21 @@ |
853 |
#ifndef WIN32 |
854 |
#include <unistd.h> |
855 |
#include <errno.h> |
856 |
-#include <iostream.h> |
857 |
#include <stdlib.h> |
858 |
#include <stdio.h> |
859 |
#include <string.h> |
860 |
#include <strings.h> |
861 |
#include <sys/types.h> |
862 |
#include <sys/uio.h> |
863 |
-#if !defined(__macos__) && !defined(__CYGWIN__) |
864 |
-#include <stropts.h> |
865 |
-#endif |
866 |
#else |
867 |
-#include <iostream> |
868 |
-using namespace std; |
869 |
#include <stdlib.h> |
870 |
#include <stdio.h> |
871 |
#include <string.h> |
872 |
#include <sys/types.h> |
873 |
#include "XrdSys/XrdWin32.hh" |
874 |
#endif |
875 |
+#include <iostream> |
876 |
+using namespace std; |
877 |
|
878 |
#include "XrdSys/XrdSysError.hh" |
879 |
#include "XrdSys/XrdSysLogger.hh" |
880 |
--- xrootd/src/XrdSys/XrdSysLogger.cc.orig 2007-07-31 02:26:45.000000000 +0000 |
881 |
+++ xrootd/src/XrdSys/XrdSysLogger.cc 2008-05-26 11:18:25.868348981 +0000 |
882 |
@@ -26,9 +26,6 @@ |
883 |
#include <strings.h> |
884 |
#include <sys/termios.h> |
885 |
#include <sys/uio.h> |
886 |
-#if !defined(__macos__) && !defined(__CYGWIN__) |
887 |
-#include <stropts.h> |
888 |
-#endif |
889 |
#endif // WIN32 |
890 |
|
891 |
#include "XrdSys/XrdSysLogger.hh" |
892 |
--- xrootd/src/XrdSys/XrdSysPlugin.cc.orig 2007-07-31 02:26:47.000000000 +0000 |
893 |
+++ xrootd/src/XrdSys/XrdSysPlugin.cc 2008-05-26 11:18:25.992356048 +0000 |
894 |
@@ -32,12 +32,11 @@ |
895 |
#include <strings.h> |
896 |
#include <sys/types.h> |
897 |
#include <errno.h> |
898 |
-#include <iostream.h> |
899 |
#else |
900 |
#include "XrdSys/XrdWin32.hh" |
901 |
+#endif |
902 |
#include <iostream> |
903 |
using namespace std; |
904 |
-#endif |
905 |
|
906 |
#include "XrdSys/XrdSysError.hh" |
907 |
#include "XrdSys/XrdSysPlugin.hh" |
908 |
--- xrootd/src/XrdSys/XrdSysPriv.cc.orig 2007-11-14 11:55:06.000000000 +0000 |
909 |
+++ xrootd/src/XrdSys/XrdSysPriv.cc 2008-05-26 11:18:25.884349893 +0000 |
910 |
@@ -23,10 +23,11 @@ |
911 |
|
912 |
#if !defined(WINDOWS) |
913 |
#include <stdio.h> |
914 |
-#include <iostream.h> |
915 |
#include <unistd.h> |
916 |
#include <pwd.h> |
917 |
#include <errno.h> |
918 |
+#include <iostream> |
919 |
+using namespace std; |
920 |
|
921 |
#define NOUC ((uid_t)(-1)) |
922 |
#define NOGC ((gid_t)(-1)) |
923 |
--- xrootd/src/XrdSys/XrdSysXSLock.cc.orig 2007-07-31 02:26:53.000000000 +0000 |
924 |
+++ xrootd/src/XrdSys/XrdSysXSLock.cc 2008-05-26 16:49:42.632709871 +0000 |
925 |
@@ -12,12 +12,8 @@ |
926 |
|
927 |
const char *XrdSysXSLockCVSID = "$Id: xrootd-20071116-gcc43.patch,v 1.1 2008/05/29 18:55:34 bicatali Exp $"; |
928 |
|
929 |
-#ifndef WIN32 |
930 |
-#include <iostream.h> |
931 |
-#else |
932 |
#include <iostream> |
933 |
using namespace std; |
934 |
-#endif |
935 |
|
936 |
#include "XrdSys/XrdSysXSLock.hh" |
937 |
|
938 |
--- xrootd/src/XrdXrootd/XrdXrootdConfig.cc.orig 2007-10-02 02:30:01.000000000 +0000 |
939 |
+++ xrootd/src/XrdXrootd/XrdXrootdConfig.cc 2008-05-26 11:18:27.808459542 +0000 |
940 |
@@ -15,13 +15,14 @@ |
941 |
#include <unistd.h> |
942 |
#include <ctype.h> |
943 |
#include <fcntl.h> |
944 |
-#include <iostream.h> |
945 |
#include <string.h> |
946 |
#include <stdio.h> |
947 |
#include <sys/param.h> |
948 |
#include <sys/stat.h> |
949 |
#include <sys/types.h> |
950 |
#include <sys/un.h> |
951 |
+#include <iostream> |
952 |
+using namespace std; |
953 |
|
954 |
#include "XrdVersion.hh" |
955 |
|
956 |
--- xrootd/src/XrdXrootd/XrdXrootdTrace.hh.orig 2004-08-30 07:17:08.000000000 +0000 |
957 |
+++ xrootd/src/XrdXrootd/XrdXrootdTrace.hh 2008-05-26 11:18:27.860462505 +0000 |
958 |
@@ -28,7 +28,7 @@ |
959 |
|
960 |
#ifndef NODEBUG |
961 |
|
962 |
-#include <iostream.h> |
963 |
+#include <iostream> |
964 |
#include "XrdOuc/XrdOucTrace.hh" |
965 |
|
966 |
#define TRACE(act, x) \ |
967 |
|
968 |
|
969 |
|
970 |
1.1 sci-physics/root/files/root-5.18.00d-gcc43.patch |
971 |
|
972 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-physics/root/files/root-5.18.00d-gcc43.patch?rev=1.1&view=markup |
973 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-physics/root/files/root-5.18.00d-gcc43.patch?rev=1.1&content-type=text/plain |
974 |
|
975 |
Index: root-5.18.00d-gcc43.patch |
976 |
=================================================================== |
977 |
--- auth/src/TAuthenticate.cxx.orig 2008-05-27 14:59:39.398520340 +0000 |
978 |
+++ auth/src/TAuthenticate.cxx 2008-05-27 15:00:18.112726537 +0000 |
979 |
@@ -39,6 +39,7 @@ |
980 |
#include "snprintf.h" |
981 |
#include "TVirtualMutex.h" |
982 |
#include "TTimer.h" |
983 |
+#include <cstdlib> |
984 |
|
985 |
#ifndef R__LYNXOS |
986 |
#include <sys/stat.h> |
987 |
--- ./auth/src/THostAuth.cxx.orig 2008-05-25 10:28:02.251108184 +0000 |
988 |
+++ ./auth/src/THostAuth.cxx 2008-05-25 10:28:13.215733022 +0000 |
989 |
@@ -26,7 +26,7 @@ |
990 |
#include "TAuthenticate.h" |
991 |
#include "TSocket.h" |
992 |
#include "TUrl.h" |
993 |
- |
994 |
+#include <cstdlib> |
995 |
|
996 |
ClassImp(THostAuth) |
997 |
|
998 |
--- ./base/src/TAttAxis.cxx.orig 2008-05-24 22:36:33.708124609 +0000 |
999 |
+++ ./base/src/TAttAxis.cxx 2008-05-25 08:49:23.464427930 +0000 |
1000 |
@@ -16,6 +16,7 @@ |
1001 |
#include "TColor.h" |
1002 |
#include "TClass.h" |
1003 |
#include "TMathBase.h" |
1004 |
+#include <cstdlib> |
1005 |
|
1006 |
ClassImp(TAttAxis) |
1007 |
|
1008 |
--- ./base/src/TError.cxx.orig 2008-05-24 22:40:36.445957450 +0000 |
1009 |
+++ ./base/src/TError.cxx 2008-05-24 22:40:55.715055533 +0000 |
1010 |
@@ -172,7 +172,7 @@ |
1011 |
gSystem->StackTrace(); |
1012 |
gSystem->Abort(); |
1013 |
} else |
1014 |
- ::abort(); |
1015 |
+ abort; |
1016 |
} |
1017 |
} |
1018 |
|
1019 |
--- ./base/src/TUUID.cxx.orig 2008-05-25 08:41:54.035949249 +0000 |
1020 |
+++ ./base/src/TUUID.cxx 2008-05-25 08:42:18.485342541 +0000 |
1021 |
@@ -112,6 +112,7 @@ |
1022 |
#include "TMD5.h" |
1023 |
#include "Bytes.h" |
1024 |
#include <string.h> |
1025 |
+#include <cstdlib> |
1026 |
#ifdef R__WIN32 |
1027 |
#include "Windows4Root.h" |
1028 |
#include <Iphlpapi.h> |
1029 |
--- ./cint/src/v6_newlink.cxx.orig 2008-05-24 22:24:14.891930941 +0000 |
1030 |
+++ ./cint/src/v6_newlink.cxx 2008-05-24 22:30:11.464250840 +0000 |
1031 |
@@ -7419,7 +7419,7 @@ |
1032 |
} |
1033 |
else { |
1034 |
if (type_name[0] == '\'') { |
1035 |
- type_name[std::strlen(type_name)-1] = '\0'; |
1036 |
+ type_name[strlen(type_name)-1] = '\0'; |
1037 |
typenum = G__defined_typename(type_name + 1); |
1038 |
} |
1039 |
else { |
1040 |
@@ -7427,7 +7427,7 @@ |
1041 |
} |
1042 |
} |
1043 |
G__separate_parameter(paras, &os, c_reftype_const); |
1044 |
- reftype_const = std::atoi(c_reftype_const); |
1045 |
+ reftype_const = atoi(c_reftype_const); |
1046 |
#ifndef G__OLDIMPLEMENTATION1861 |
1047 |
//if (typenum != -1) { |
1048 |
// NO - this is already taken into account when writing the dictionary |
1049 |
--- ./cint/tool/makecint.cxx.orig 2008-05-24 22:30:46.370240018 +0000 |
1050 |
+++ ./cint/tool/makecint.cxx 2008-05-24 22:32:51.115285863 +0000 |
1051 |
@@ -32,6 +32,8 @@ |
1052 |
#include <iostream> |
1053 |
#include <fstream> |
1054 |
#include <list> |
1055 |
+#include <cstring> |
1056 |
+#include <cstdlib> |
1057 |
|
1058 |
std::string G__DLLID; |
1059 |
std::string G__MACRO; |
1060 |
--- ./cint7/tool/makecint.cxx.orig 2008-05-26 10:54:04.645078613 +0000 |
1061 |
+++ ./cint7/tool/makecint.cxx 2008-05-26 10:54:27.114359064 +0000 |
1062 |
@@ -32,6 +32,8 @@ |
1063 |
#include <iostream> |
1064 |
#include <fstream> |
1065 |
#include <list> |
1066 |
+#include <cstring> |
1067 |
+#include <cstdlib> |
1068 |
|
1069 |
std::string G__DLLID; |
1070 |
std::string G__MACRO; |
1071 |
--- ./cintex/src/ROOTClassEnhancer.cxx.orig 2008-05-25 15:52:43.464836386 +0000 |
1072 |
+++ ./cintex/src/ROOTClassEnhancer.cxx 2008-05-25 15:53:02.765936293 +0000 |
1073 |
@@ -32,6 +32,7 @@ |
1074 |
#undef G__DICTIONARY |
1075 |
|
1076 |
#include <sstream> |
1077 |
+#include <memory> |
1078 |
|
1079 |
#if ROOT_VERSION_CODE >= ROOT_VERSION(5,1,1) |
1080 |
#include "TVirtualIsAProxy.h" |
1081 |
--- ./cont/src/TObjArray.cxx.orig 2008-05-25 08:43:10.644314911 +0000 |
1082 |
+++ ./cont/src/TObjArray.cxx 2008-05-25 08:43:38.361894446 +0000 |
1083 |
@@ -28,6 +28,7 @@ |
1084 |
#include "TObjArray.h" |
1085 |
#include "TError.h" |
1086 |
#include "TROOT.h" |
1087 |
+#include <cstdlib> |
1088 |
|
1089 |
ClassImp(TObjArray) |
1090 |
|
1091 |
--- ./eg/src/TDatabasePDG.cxx.orig 2008-05-25 10:20:38.801837450 +0000 |
1092 |
+++ ./eg/src/TDatabasePDG.cxx 2008-05-25 10:20:53.242660386 +0000 |
1093 |
@@ -17,7 +17,7 @@ |
1094 |
#include "TDatabasePDG.h" |
1095 |
#include "TDecayChannel.h" |
1096 |
#include "TParticlePDG.h" |
1097 |
- |
1098 |
+#include <cstdlib> |
1099 |
|
1100 |
//////////////////////////////////////////////////////////////////////// |
1101 |
// |
1102 |
--- ./eve/src/TEveTrans.cxx.orig 2008-05-25 14:25:05.515059385 +0000 |
1103 |
+++ ./eve/src/TEveTrans.cxx 2008-05-25 14:25:19.659865451 +0000 |
1104 |
@@ -41,6 +41,7 @@ |
1105 |
#include "TClass.h" |
1106 |
|
1107 |
#include <ctype.h> |
1108 |
+#include <iostream> |
1109 |
|
1110 |
#define F00 0 |
1111 |
#define F01 4 |
1112 |
--- ./gdml/src/TGDMLParse.cxx.orig 2008-05-25 17:42:19.033722903 +0000 |
1113 |
+++ ./gdml/src/TGDMLParse.cxx 2008-05-25 17:43:16.480996636 +0000 |
1114 |
@@ -78,6 +78,7 @@ |
1115 |
|
1116 |
****************************************************************************/ |
1117 |
|
1118 |
+#include <cstdlib> |
1119 |
#include "TGeoMatrix.h" |
1120 |
#include "TXMLEngine.h" |
1121 |
#include "TGeoVolume.h" |
1122 |
--- ./ged/src/TStyleDialog.cxx.orig 2008-05-25 10:15:22.252869328 +0000 |
1123 |
+++ ./ged/src/TStyleDialog.cxx 2008-05-25 10:15:35.321614073 +0000 |
1124 |
@@ -32,6 +32,7 @@ |
1125 |
#include <TStyle.h> |
1126 |
#include <TVirtualPad.h> |
1127 |
#include <TVirtualMutex.h> |
1128 |
+#include <cstdlib> |
1129 |
|
1130 |
ClassImp(TStyleDialog) |
1131 |
|
1132 |
--- ./geompainter/src/TGeoChecker.cxx.orig 2008-05-25 10:25:11.005349444 +0000 |
1133 |
+++ ./geompainter/src/TGeoChecker.cxx 2008-05-25 10:25:27.546292059 +0000 |
1134 |
@@ -88,6 +88,7 @@ |
1135 |
#include "TBuffer3D.h" |
1136 |
#include "TBuffer3DTypes.h" |
1137 |
#include "TMath.h" |
1138 |
+#include <cstdlib> |
1139 |
|
1140 |
// statics and globals |
1141 |
|
1142 |
--- ./gl/src/TX11GL.cxx.orig 2008-05-25 14:19:39.424476542 +0000 |
1143 |
+++ ./gl/src/TX11GL.cxx 2008-05-25 14:19:58.021536328 +0000 |
1144 |
@@ -11,7 +11,7 @@ |
1145 |
|
1146 |
#include <deque> |
1147 |
#include <map> |
1148 |
- |
1149 |
+#include <cstdlib> |
1150 |
#include "TVirtualViewer3D.h" |
1151 |
#include "TVirtualX.h" |
1152 |
#include "TGLViewer.h" |
1153 |
@@ -521,7 +521,7 @@ |
1154 |
char *dest = ctx.fXImage->data; |
1155 |
const UChar_t *src = &ctx.fBUBuffer[ctx.fW * 4 * (ctx.fH - 1)]; |
1156 |
for (UInt_t i = 0, e = ctx.fH; i < e; ++i) { |
1157 |
- std::memcpy(dest, src, ctx.fW * 4); |
1158 |
+ memcpy(dest, src, ctx.fW * 4); |
1159 |
dest += ctx.fW * 4; |
1160 |
src -= ctx.fW * 4; |
1161 |
} |
1162 |
--- ./graf/src/TGraph.cxx.orig 2008-05-25 09:26:57.835797472 +0000 |
1163 |
+++ ./graf/src/TGraph.cxx 2008-05-25 09:27:09.664471550 +0000 |
1164 |
@@ -10,6 +10,7 @@ |
1165 |
*************************************************************************/ |
1166 |
|
1167 |
#include <string.h> |
1168 |
+#include <cstdlib> |
1169 |
|
1170 |
#include "Riostream.h" |
1171 |
#include "TROOT.h" |
1172 |
--- ./graf/src/TMultiGraph.cxx.orig 2008-05-25 09:27:21.449143120 +0000 |
1173 |
+++ ./graf/src/TMultiGraph.cxx 2008-05-25 09:27:35.985971527 +0000 |
1174 |
@@ -20,6 +20,7 @@ |
1175 |
#include "TMath.h" |
1176 |
|
1177 |
#include <ctype.h> |
1178 |
+#include <cstdlib> |
1179 |
|
1180 |
extern void H1LeastSquareSeqnd(Int_t n, Double_t *a, Int_t idim, Int_t &ifail, Int_t k, Double_t *b); |
1181 |
|
1182 |
--- ./gui/inc/TGFSContainer.h.orig 2008-05-25 09:37:07.946565703 +0000 |
1183 |
+++ ./gui/inc/TGFSContainer.h 2008-05-25 09:37:22.427390919 +0000 |
1184 |
@@ -12,6 +12,7 @@ |
1185 |
#ifndef ROOT_TGFSContainer |
1186 |
#define ROOT_TGFSContainer |
1187 |
|
1188 |
+#include <cstdlib> |
1189 |
|
1190 |
////////////////////////////////////////////////////////////////////////// |
1191 |
// // |
1192 |
--- ./gui/src/TGCanvas.cxx.orig 2008-05-25 09:33:15.625326471 +0000 |
1193 |
+++ ./gui/src/TGCanvas.cxx 2008-05-25 09:33:38.994658213 +0000 |
1194 |
@@ -68,7 +68,7 @@ |
1195 |
#include "TKeyMapFile.h" |
1196 |
#include "TGDNDManager.h" |
1197 |
#include "Riostream.h" |
1198 |
- |
1199 |
+#include <cstdlib> |
1200 |
|
1201 |
TGGC *TGContainer::fgLineGC = 0; |
1202 |
|
1203 |
--- ./gui/src/TGFileBrowser.cxx.orig 2008-05-25 09:38:24.270915180 +0000 |
1204 |
+++ ./gui/src/TGFileBrowser.cxx 2008-05-25 09:38:38.427721931 +0000 |
1205 |
@@ -37,6 +37,7 @@ |
1206 |
#include "Getline.h" |
1207 |
#include <time.h> |
1208 |
#include <string.h> |
1209 |
+#include <cstdlib> |
1210 |
|
1211 |
#include "TGFileBrowser.h" |
1212 |
#include "TRootBrowser.h" |
1213 |
--- ./gui/src/TGFont.cxx.orig 2008-05-25 09:39:31.914769984 +0000 |
1214 |
+++ ./gui/src/TGFont.cxx 2008-05-25 09:39:51.429168201 +0000 |
1215 |
@@ -40,6 +40,8 @@ |
1216 |
#include "TObjString.h" |
1217 |
#include "TGWidget.h" |
1218 |
#include <errno.h> |
1219 |
+#include <cstdlib> |
1220 |
+#include <climits> |
1221 |
|
1222 |
#include "Riostream.h" |
1223 |
#include "TROOT.h" |
1224 |
--- ./gui/src/TGFontDialog.cxx.orig 2008-05-25 09:40:59.463015168 +0000 |
1225 |
+++ ./gui/src/TGFontDialog.cxx 2008-05-25 09:41:13.344862645 +0000 |
1226 |
@@ -28,7 +28,7 @@ |
1227 |
#include "TGLabel.h" |
1228 |
#include "TGListBox.h" |
1229 |
#include "TGComboBox.h" |
1230 |
- |
1231 |
+#include <cstdlib> |
1232 |
|
1233 |
|
1234 |
enum EFontDialog { |
1235 |
--- ./gui/src/TGListBox.cxx.orig 2008-05-25 09:44:07.356365781 +0000 |
1236 |
+++ ./gui/src/TGListBox.cxx 2008-05-25 09:44:23.409280584 +0000 |
1237 |
@@ -45,7 +45,7 @@ |
1238 |
#include "TGResourcePool.h" |
1239 |
#include "TSystem.h" |
1240 |
#include "Riostream.h" |
1241 |
- |
1242 |
+#include <cstdlib> |
1243 |
|
1244 |
const TGFont *TGTextLBEntry::fgDefaultFont = 0; |
1245 |
TGGC *TGTextLBEntry::fgDefaultGC = 0; |
1246 |
--- ./gui/src/TGPicture.cxx.orig 2008-05-25 09:51:57.143137403 +0000 |
1247 |
+++ ./gui/src/TGPicture.cxx 2008-05-25 09:52:14.584131309 +0000 |
1248 |
@@ -38,6 +38,7 @@ |
1249 |
#include "TGWindow.h" |
1250 |
#include "TVirtualX.h" |
1251 |
#include "TImage.h" |
1252 |
+#include <cstdlib> |
1253 |
|
1254 |
TGGC *TGSelectedPicture::fgSelectedGC = 0; |
1255 |
|
1256 |
--- ./gui/src/TGTripleSlider.cxx.orig 2008-05-25 10:10:41.092846931 +0000 |
1257 |
+++ ./gui/src/TGTripleSlider.cxx 2008-05-25 10:10:55.553671007 +0000 |
1258 |
@@ -66,6 +66,7 @@ |
1259 |
#include "TGPicture.h" |
1260 |
#include "Riostream.h" |
1261 |
#include "TSystem.h" |
1262 |
+#include <cstdlib> |
1263 |
|
1264 |
ClassImp(TGTripleVSlider) |
1265 |
ClassImp(TGTripleHSlider) |
1266 |
--- ./guihtml/src/TGHtmlBrowser.cxx.orig 2008-05-25 11:24:03.352261093 +0000 |
1267 |
+++ ./guihtml/src/TGHtmlBrowser.cxx 2008-05-25 11:26:01.675003922 +0000 |
1268 |
@@ -9,6 +9,7 @@ |
1269 |
* For the list of contributors see $ROOTSYS/README/CREDITS. * |
1270 |
*************************************************************************/ |
1271 |
|
1272 |
+#include <cstdlib> |
1273 |
#include "TROOT.h" |
1274 |
#include "TApplication.h" |
1275 |
#include "TSystem.h" |
1276 |
--- ./guihtml/src/TGHtmlIndex.cxx.orig 2008-05-25 11:25:16.760444387 +0000 |
1277 |
+++ ./guihtml/src/TGHtmlIndex.cxx 2008-05-25 11:25:35.581516939 +0000 |
1278 |
@@ -35,6 +35,7 @@ |
1279 |
|
1280 |
#include <ctype.h> |
1281 |
#include <string.h> |
1282 |
+#include <cstdlib> |
1283 |
|
1284 |
#include "TGHtml.h" |
1285 |
|
1286 |
--- ./hist/src/TGraph2D.cxx.orig 2008-05-25 09:18:31.516888891 +0000 |
1287 |
+++ ./hist/src/TGraph2D.cxx 2008-05-25 09:19:08.553054573 +0000 |
1288 |
@@ -20,6 +20,7 @@ |
1289 |
#include "TVirtualPad.h" |
1290 |
#include "TVirtualFitter.h" |
1291 |
#include "TClass.h" |
1292 |
+#include <cstdlib> |
1293 |
|
1294 |
ClassImp(TGraph2D) |
1295 |
|
1296 |
--- ./html/src/TDocDirective.cxx.orig 2008-05-25 10:18:34.367817335 +0000 |
1297 |
+++ ./html/src/TDocDirective.cxx 2008-05-25 10:18:48.938177793 +0000 |
1298 |
@@ -18,6 +18,7 @@ |
1299 |
#include "TVirtualMutex.h" |
1300 |
#include <fstream> |
1301 |
#include <sstream> |
1302 |
+#include <cstdlib> |
1303 |
|
1304 |
//______________________________________________________________________________ |
1305 |
// |
1306 |
--- ./html/src/TDocOutput.cxx.orig 2008-05-25 10:19:54.305206711 +0000 |
1307 |
+++ ./html/src/TDocOutput.cxx 2008-05-25 10:20:08.882745853 +0000 |
1308 |
@@ -28,6 +28,7 @@ |
1309 |
#include <list> |
1310 |
#include <set> |
1311 |
#include <sstream> |
1312 |
+#include <cstdlib> |
1313 |
|
1314 |
namespace { |
1315 |
|
1316 |
--- ./io/src/TArchiveFile.cxx.orig 2008-05-25 08:50:00.030511713 +0000 |
1317 |
+++ ./io/src/TArchiveFile.cxx 2008-05-25 08:50:15.595398705 +0000 |
1318 |
@@ -25,7 +25,7 @@ |
1319 |
#include "TObjString.h" |
1320 |
#include "TError.h" |
1321 |
#include "TUrl.h" |
1322 |
- |
1323 |
+#include <cstdlib> |
1324 |
|
1325 |
ClassImp(TArchiveFile) |
1326 |
|
1327 |
--- ./io/src/TContainerConverters.cxx.orig 2008-05-25 08:51:09.186452685 +0000 |
1328 |
+++ ./io/src/TContainerConverters.cxx 2008-05-25 08:51:27.199479189 +0000 |
1329 |
@@ -23,6 +23,7 @@ |
1330 |
#include "TError.h" |
1331 |
#include "TGenCollectionStreamer.h" |
1332 |
#include "TClassStreamer.h" |
1333 |
+#include <cstdlib> |
1334 |
|
1335 |
namespace { |
1336 |
const Int_t kMapOffset = 2; |
1337 |
--- ./main/src/pmain.cxx.orig 2008-05-25 18:14:20.624507431 +0000 |
1338 |
+++ ./main/src/pmain.cxx 2008-05-25 18:14:33.073216842 +0000 |
1339 |
@@ -18,6 +18,7 @@ |
1340 |
////////////////////////////////////////////////////////////////////////// |
1341 |
#include <stdio.h> |
1342 |
#include <errno.h> |
1343 |
+#include <cstdlib> |
1344 |
|
1345 |
#ifdef WIN32 |
1346 |
#include <io.h> |
1347 |
--- ./main/src/hadd.cxx.orig 2008-05-26 10:41:56.074140838 +0000 |
1348 |
+++ ./main/src/hadd.cxx 2008-05-26 10:42:21.211573339 +0000 |
1349 |
@@ -59,6 +59,7 @@ |
1350 |
|
1351 |
#include "RConfig.h" |
1352 |
#include <string> |
1353 |
+#include <cstdlib> |
1354 |
#include "TChain.h" |
1355 |
#include "TFile.h" |
1356 |
#include "THashList.h" |
1357 |
--- ./math/src/TRandom1.cxx.orig 2008-05-25 08:43:53.014729463 +0000 |
1358 |
+++ ./math/src/TRandom1.cxx 2008-05-25 08:48:16.172593187 +0000 |
1359 |
@@ -19,6 +19,7 @@ |
1360 |
#include "TRandom1.h" |
1361 |
#include "TRandom3.h" |
1362 |
#include "TMath.h" |
1363 |
+#include <cstdlib> |
1364 |
|
1365 |
// Number of instances with automatic seed selection |
1366 |
int TRandom1::fgNumEngines = 0; |
1367 |
--- ./mathmore/src/GSLRndmEngines.cxx.orig 2008-05-25 15:06:34.176639662 +0000 |
1368 |
+++ ./mathmore/src/GSLRndmEngines.cxx 2008-05-25 15:06:51.937651805 +0000 |
1369 |
@@ -34,6 +34,7 @@ |
1370 |
// need to be included later |
1371 |
#include <time.h> |
1372 |
#include <cassert> |
1373 |
+#include <cstdlib> |
1374 |
|
1375 |
#include "gsl/gsl_rng.h" |
1376 |
#include "gsl/gsl_randist.h" |
1377 |
--- ./matrix/src/TMatrixTBase.cxx.orig 2008-05-25 09:13:03.646204606 +0000 |
1378 |
+++ ./matrix/src/TMatrixTBase.cxx 2008-05-25 09:14:18.674480223 +0000 |
1379 |
@@ -207,6 +207,7 @@ |
1380 |
#include "TROOT.h" |
1381 |
#include "TClass.h" |
1382 |
#include "TMath.h" |
1383 |
+#include <climits> |
1384 |
|
1385 |
Int_t gMatrixCheck = 1; |
1386 |
|
1387 |
--- ./minuit2/src/MnUserTransformation.cxx.orig 2008-05-25 15:13:19.005328722 +0000 |
1388 |
+++ ./minuit2/src/MnUserTransformation.cxx 2008-05-25 15:13:35.010240790 +0000 |
1389 |
@@ -11,6 +11,7 @@ |
1390 |
#include "Minuit2/MnUserCovariance.h" |
1391 |
|
1392 |
#include <algorithm> |
1393 |
+#include <cstdio> |
1394 |
|
1395 |
namespace ROOT { |
1396 |
|
1397 |
--- ./mlp/src/TMLPAnalyzer.cxx.orig 2008-05-25 10:26:07.216552738 +0000 |
1398 |
+++ ./mlp/src/TMLPAnalyzer.cxx 2008-05-25 10:26:20.093286541 +0000 |
1399 |
@@ -38,6 +38,7 @@ |
1400 |
#include "TRegexp.h" |
1401 |
#include "TMath.h" |
1402 |
#include "Riostream.h" |
1403 |
+#include <cstdlib> |
1404 |
|
1405 |
ClassImp(TMLPAnalyzer) |
1406 |
|
1407 |
--- ./mlp/src/TMultiLayerPerceptron.cxx.orig 2008-05-25 10:27:02.107680805 +0000 |
1408 |
+++ ./mlp/src/TMultiLayerPerceptron.cxx 2008-05-25 10:27:24.544959433 +0000 |
1409 |
@@ -242,6 +242,7 @@ |
1410 |
#include "TLine.h" |
1411 |
#include "TText.h" |
1412 |
#include "TObjString.h" |
1413 |
+#include <cstdlib> |
1414 |
|
1415 |
ClassImp(TMultiLayerPerceptron) |
1416 |
|
1417 |
--- ./mysql/src/TMySQLStatement.cxx.orig 2008-05-25 14:27:19.826713370 +0000 |
1418 |
+++ ./mysql/src/TMySQLStatement.cxx 2008-05-25 14:27:40.607897622 +0000 |
1419 |
@@ -21,6 +21,7 @@ |
1420 |
#include "TDataType.h" |
1421 |
#include "TDatime.h" |
1422 |
#include "snprintf.h" |
1423 |
+#include <cstdlib> |
1424 |
|
1425 |
ClassImp(TMySQLStatement) |
1426 |
|
1427 |
--- ./net/src/TWebFile.cxx.orig 2008-05-25 09:12:33.080462763 +0000 |
1428 |
+++ ./net/src/TWebFile.cxx 2008-05-25 09:12:48.141321033 +0000 |
1429 |
@@ -22,6 +22,7 @@ |
1430 |
#include "TROOT.h" |
1431 |
#include "TSocket.h" |
1432 |
#include "Bytes.h" |
1433 |
+#include <cstdlib> |
1434 |
|
1435 |
static const char *gUserAgent = "User-Agent: ROOT-TWebFile/1.0"; |
1436 |
|
1437 |
--- ./newdelete/src/MemCheck.cxx.orig 2008-05-25 09:18:01.787194692 +0000 |
1438 |
+++ ./newdelete/src/MemCheck.cxx 2008-05-25 09:18:18.764162155 +0000 |
1439 |
@@ -57,6 +57,7 @@ |
1440 |
#include <stdio.h> |
1441 |
#include <string.h> |
1442 |
#include <signal.h> |
1443 |
+#include <cstdlib> |
1444 |
#include "MemCheck.h" |
1445 |
#include "TSystem.h" |
1446 |
#include "TEnv.h" |
1447 |
--- ./odbc/src/TODBCStatement.cxx.orig 2008-05-25 14:43:38.376313784 +0000 |
1448 |
+++ ./odbc/src/TODBCStatement.cxx 2008-05-25 14:43:53.429171597 +0000 |
1449 |
@@ -24,6 +24,7 @@ |
1450 |
#include "snprintf.h" |
1451 |
#include "Riostream.h" |
1452 |
|
1453 |
+#include <cstdlib> |
1454 |
#include <sqlext.h> |
1455 |
|
1456 |
#define kSqlTime 123781 |
1457 |
--- ./proof/src/TCondor.cxx.orig 2008-05-25 11:19:42.985423633 +0000 |
1458 |
+++ ./proof/src/TCondor.cxx 2008-05-25 11:20:00.374414575 +0000 |
1459 |
@@ -28,6 +28,7 @@ |
1460 |
#include "Riostream.h" |
1461 |
#include "TEnv.h" |
1462 |
#include "TClass.h" |
1463 |
+#include <cstdlib> |
1464 |
|
1465 |
ClassImp(TCondorSlave) |
1466 |
ClassImp(TCondor) |
1467 |
--- ./proof/src/TProof.cxx.orig 2008-05-25 11:20:29.484073440 +0000 |
1468 |
+++ ./proof/src/TProof.cxx 2008-05-25 11:20:41.060733156 +0000 |
1469 |
@@ -22,6 +22,7 @@ |
1470 |
|
1471 |
#include <fcntl.h> |
1472 |
#include <errno.h> |
1473 |
+#include <cstdlib> |
1474 |
#ifdef WIN32 |
1475 |
# include <io.h> |
1476 |
# include <sys/stat.h> |
1477 |
--- ./proof/src/TProofServ.cxx.orig 2008-05-25 11:21:04.342059883 +0000 |
1478 |
+++ ./proof/src/TProofServ.cxx 2008-05-25 11:21:17.246795282 +0000 |
1479 |
@@ -23,7 +23,7 @@ |
1480 |
#include "RConfigure.h" |
1481 |
#include "RConfig.h" |
1482 |
#include "Riostream.h" |
1483 |
- |
1484 |
+#include <cstdlib> |
1485 |
#ifdef WIN32 |
1486 |
#include <io.h> |
1487 |
typedef long off_t; |
1488 |
--- ./proof/src/TSlave.cxx.orig 2008-05-25 11:21:49.988661135 +0000 |
1489 |
+++ ./proof/src/TSlave.cxx 2008-05-25 11:22:56.160432049 +0000 |
1490 |
@@ -20,6 +20,7 @@ |
1491 |
// // |
1492 |
////////////////////////////////////////////////////////////////////////// |
1493 |
|
1494 |
+#include <cstdlib> |
1495 |
#include "RConfigure.h" |
1496 |
#include "TApplication.h" |
1497 |
#include "TSlave.h" |
1498 |
--- ./reflex/src/DataMember.cxx.orig 2008-05-25 14:49:19.567757176 +0000 |
1499 |
+++ ./reflex/src/DataMember.cxx 2008-05-25 14:50:02.166184722 +0000 |
1500 |
@@ -23,7 +23,7 @@ |
1501 |
|
1502 |
#include "Reflex/Tools.h" |
1503 |
#include "Class.h" |
1504 |
- |
1505 |
+#include <cstring> |
1506 |
|
1507 |
//------------------------------------------------------------------------------- |
1508 |
ROOT::Reflex::DataMember::DataMember( const char * nam, |
1509 |
--- ./reflex/src/PluginFactoryMap.cxx.orig 2008-05-25 14:58:58.622679122 +0000 |
1510 |
+++ ./reflex/src/PluginFactoryMap.cxx 2008-05-25 15:00:31.051946365 +0000 |
1511 |
@@ -21,6 +21,7 @@ |
1512 |
#include <vector> |
1513 |
#include <map> |
1514 |
#include <set> |
1515 |
+#include <cstring> |
1516 |
|
1517 |
using namespace ROOT::Reflex; |
1518 |
using namespace std; |
1519 |
--- ./reflex/src/Tools.cxx.orig 2008-05-25 15:02:11.333661095 +0000 |
1520 |
+++ ./reflex/src/Tools.cxx 2008-05-25 15:02:22.654306221 +0000 |
1521 |
@@ -13,6 +13,7 @@ |
1522 |
#define REFLEX_BUILD |
1523 |
#endif |
1524 |
|
1525 |
+#include <cstring> |
1526 |
#include "Reflex/Tools.h" |
1527 |
|
1528 |
#include "Reflex/Kernel.h" |
1529 |
--- ./sessionviewer/src/TSessionViewer.cxx.orig 2008-05-25 11:23:25.334094561 +0000 |
1530 |
+++ ./sessionviewer/src/TSessionViewer.cxx 2008-05-25 11:23:39.210885354 +0000 |
1531 |
@@ -18,6 +18,7 @@ |
1532 |
// // |
1533 |
////////////////////////////////////////////////////////////////////////// |
1534 |
|
1535 |
+#include <cstdlib> |
1536 |
#include "TApplication.h" |
1537 |
#include "TROOT.h" |
1538 |
#include "THashList.h" |
1539 |
--- ./smatrix/inc/Math/Expression.h.orig 2008-05-25 10:33:42.434494130 +0000 |
1540 |
+++ ./smatrix/inc/Math/Expression.h 2008-05-25 10:33:55.707250502 +0000 |
1541 |
@@ -45,6 +45,7 @@ |
1542 |
|
1543 |
|
1544 |
#include <iomanip> |
1545 |
+#include <iostream> |
1546 |
|
1547 |
namespace ROOT { |
1548 |
|
1549 |
--- ./sql/inc/TSQLFile.h.orig 2008-05-25 10:36:17.827349464 +0000 |
1550 |
+++ ./sql/inc/TSQLFile.h 2008-05-25 10:36:39.340575433 +0000 |
1551 |
@@ -12,6 +12,7 @@ |
1552 |
#ifndef ROOT_TSQLFile |
1553 |
#define ROOT_TSQLFile |
1554 |
|
1555 |
+#include <cstdlib> |
1556 |
|
1557 |
///////////////////////////////////////////////////////////////////////// |
1558 |
// // |
1559 |
--- ./tmva/src/BinarySearchTree.cxx.orig 2008-05-25 10:41:43.737922050 +0000 |
1560 |
+++ ./tmva/src/BinarySearchTree.cxx 2008-05-25 10:42:07.063251284 +0000 |
1561 |
@@ -66,6 +66,7 @@ |
1562 |
#ifndef ROOT_TMVA_BinarySearchTree |
1563 |
#include "TMVA/BinarySearchTree.h" |
1564 |
#endif |
1565 |
+#include <algorithm> |
1566 |
|
1567 |
ClassImp(TMVA::BinarySearchTree) |
1568 |
|
1569 |
--- ./tmva/src/MethodANNBase.cxx.orig 2008-05-25 10:42:47.477554364 +0000 |
1570 |
+++ ./tmva/src/MethodANNBase.cxx 2008-05-25 10:43:04.486523650 +0000 |
1571 |
@@ -31,6 +31,7 @@ |
1572 |
|
1573 |
#include "TString.h" |
1574 |
#include <vector> |
1575 |
+#include <cstdlib> |
1576 |
#include "TTree.h" |
1577 |
#include "TDirectory.h" |
1578 |
#include "Riostream.h" |
1579 |
--- ./tmva/src/MethodCFMlpANN.cxx.orig 2008-05-25 10:43:52.501259854 +0000 |
1580 |
+++ ./tmva/src/MethodCFMlpANN.cxx 2008-05-25 10:43:27.107812764 +0000 |
1581 |
@@ -65,6 +65,7 @@ |
1582 |
|
1583 |
#include <iostream> |
1584 |
#include <string> |
1585 |
+#include <cstdlib> |
1586 |
|
1587 |
#include "Riostream.h" |
1588 |
#include "TMath.h" |
1589 |
--- ./tmva/src/MethodCFMlpANN_Utils.cxx.orig 2008-05-25 10:44:57.164944827 +0000 |
1590 |
+++ ./tmva/src/MethodCFMlpANN_Utils.cxx 2008-05-25 10:45:09.757662445 +0000 |
1591 |
@@ -58,6 +58,7 @@ |
1592 |
//_______________________________________________________________________ |
1593 |
|
1594 |
#include <iostream> |
1595 |
+#include <cstdlib> |
1596 |
|
1597 |
#include "TMVA/MethodCFMlpANN_Utils.h" |
1598 |
#include "TMVA/Timer.h" |
1599 |
--- ./tmva/src/MethodCuts.cxx.orig 2008-05-25 10:45:47.783829433 +0000 |
1600 |
+++ ./tmva/src/MethodCuts.cxx 2008-05-25 10:46:04.640790057 +0000 |
1601 |
@@ -91,6 +91,7 @@ |
1602 |
//_______________________________________________________________________ |
1603 |
|
1604 |
#include <iostream> |
1605 |
+#include <cstdlib> |
1606 |
|
1607 |
#include <stdio.h> |
1608 |
#include "time.h" |
1609 |
--- ./tmva/src/MethodFDA.cxx.orig 2008-05-25 10:46:38.050693979 +0000 |
1610 |
+++ ./tmva/src/MethodFDA.cxx 2008-05-25 10:46:50.347720956 +0000 |
1611 |
@@ -33,6 +33,7 @@ |
1612 |
// Algorithm, Simulated Annealing, MINUIT and combinations of these. // |
1613 |
//_______________________________________________________________________ |
1614 |
|
1615 |
+#include <cstdlib> |
1616 |
#include "Riostream.h" |
1617 |
#include "TList.h" |
1618 |
#include "TFormula.h" |
1619 |
--- ./tmva/src/MethodKNN.cxx.orig 2008-05-25 10:47:22.277569444 +0000 |
1620 |
+++ ./tmva/src/MethodKNN.cxx 2008-05-25 10:47:34.772031819 +0000 |
1621 |
@@ -33,6 +33,7 @@ |
1622 |
|
1623 |
// C++ |
1624 |
#include <string> |
1625 |
+#include <cstdlib> |
1626 |
|
1627 |
// ROOT |
1628 |
#include "TFile.h" |
1629 |
--- ./tmva/src/MethodPDERS.cxx.orig 2008-05-25 10:48:06.849814742 +0000 |
1630 |
+++ ./tmva/src/MethodPDERS.cxx 2008-05-25 10:48:24.949792717 +0000 |
1631 |
@@ -66,6 +66,7 @@ |
1632 |
//_______________________________________________________________________ |
1633 |
|
1634 |
#include <assert.h> |
1635 |
+#include <algorithm> |
1636 |
|
1637 |
#include "TFile.h" |
1638 |
#include "TObjString.h" |
1639 |
--- ./tmva/src/MethodSeedDistance.cxx.orig 2008-05-25 10:48:56.188225273 +0000 |
1640 |
+++ ./tmva/src/MethodSeedDistance.cxx 2008-05-25 10:49:11.417093116 +0000 |
1641 |
@@ -29,6 +29,7 @@ |
1642 |
End_Html */ |
1643 |
//_______________________________________________________________________ |
1644 |
|
1645 |
+#include <cstdlib> |
1646 |
#include "Riostream.h" |
1647 |
#include "TList.h" |
1648 |
#include "TFormula.h" |
1649 |
--- ./tmva/src/MsgLogger.cxx.orig 2008-05-25 10:49:50.563323933 +0000 |
1650 |
+++ ./tmva/src/MsgLogger.cxx 2008-05-25 10:50:03.972088055 +0000 |
1651 |
@@ -30,6 +30,7 @@ |
1652 |
#include <iomanip> |
1653 |
#include <iostream> |
1654 |
#include <string> |
1655 |
+#include <cstdlib> |
1656 |
|
1657 |
using std::string; |
1658 |
using std::cout; |
1659 |
--- ./tree/src/TBufferSQL.cxx.orig 2008-05-25 09:24:39.647922594 +0000 |
1660 |
+++ ./tree/src/TBufferSQL.cxx 2008-05-25 09:24:53.280699482 +0000 |
1661 |
@@ -18,6 +18,7 @@ |
1662 |
////////////////////////////////////////////////////////////////////////// |
1663 |
|
1664 |
#include <stdio.h> |
1665 |
+#include <cstdlib> |
1666 |
#include "Riostream.h" |
1667 |
#include "TError.h" |
1668 |
|
1669 |
--- ./tree/src/TTreeSQL.cxx.orig 2008-05-25 09:25:53.536133243 +0000 |
1670 |
+++ ./tree/src/TTreeSQL.cxx 2008-05-25 09:26:05.680825330 +0000 |
1671 |
@@ -20,6 +20,7 @@ |
1672 |
#include <Riostream.h> |
1673 |
#include <vector> |
1674 |
#include <map> |
1675 |
+#include <cstdlib> |
1676 |
|
1677 |
#include "TString.h" |
1678 |
#include "TROOT.h" |
1679 |
--- ./utils/src/rlibmap.cxx.orig 2008-05-24 22:33:42.550370884 +0000 |
1680 |
+++ ./utils/src/rlibmap.cxx 2008-05-24 22:34:01.139430215 +0000 |
1681 |
@@ -28,6 +28,7 @@ |
1682 |
#include <fcntl.h> |
1683 |
#include <string> |
1684 |
#include <vector> |
1685 |
+#include <cstring> |
1686 |
#ifndef WIN32 |
1687 |
# include <unistd.h> |
1688 |
#else |
1689 |
--- ./xml/src/TXMLEngine.cxx.orig 2008-05-25 10:30:33.687738066 +0000 |
1690 |
+++ ./xml/src/TXMLEngine.cxx 2008-05-25 10:30:47.300513814 +0000 |
1691 |
@@ -23,6 +23,7 @@ |
1692 |
|
1693 |
#include "Riostream.h" |
1694 |
#include "TString.h" |
1695 |
+#include <cstdlib> |
1696 |
|
1697 |
ClassImp(TXMLEngine); |
1698 |
|
1699 |
--- ./xml/src/TXMLSetup.cxx.orig 2008-05-25 10:31:20.746419787 +0000 |
1700 |
+++ ./xml/src/TXMLSetup.cxx 2008-05-25 10:31:38.287419392 +0000 |
1701 |
@@ -38,6 +38,7 @@ |
1702 |
#include "TStreamerElement.h" |
1703 |
|
1704 |
#include "Riostream.h" |
1705 |
+#include <cstdlib> |
1706 |
|
1707 |
ClassImp(TXMLSetup); |
1708 |
|
1709 |
|
1710 |
|
1711 |
|
1712 |
1.1 sci-physics/root/files/root-5.18.00d-makefile.patch |
1713 |
|
1714 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-physics/root/files/root-5.18.00d-makefile.patch?rev=1.1&view=markup |
1715 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-physics/root/files/root-5.18.00d-makefile.patch?rev=1.1&content-type=text/plain |
1716 |
|
1717 |
Index: root-5.18.00d-makefile.patch |
1718 |
=================================================================== |
1719 |
--- Makefile.orig 2008-05-27 09:06:38.300582081 +0000 |
1720 |
+++ Makefile 2008-05-27 09:07:17.946841392 +0000 |
1721 |
@@ -898,8 +898,8 @@ |
1722 |
$(INSTALLDATA) build/misc/root-help.el $(DESTDIR)$(ELISPDIR); \ |
1723 |
echo "Installing GDML conversion scripts in $(DESTDIR)$(LIBDIR)"; \ |
1724 |
$(INSTALLDATA) gdml/*.py $(DESTDIR)$(LIBDIR); \ |
1725 |
- find $(DESTDIR)$(DATADIR) -name CVS -exec rm -rf {} \; >/dev/null 2>&1; \ |
1726 |
- find $(DESTDIR)$(DATADIR) -name .svn -exec rm -rf {} \; >/dev/null 2>&1; \ |
1727 |
+ find $(DESTDIR)$(LIBDIR) -name CVS -exec rm -rf {} \; >/dev/null 2>&1; \ |
1728 |
+ find $(DESTDIR)$(LIBDIR) -name .svn -exec rm -rf {} \; >/dev/null 2>&1; \ |
1729 |
fi |
1730 |
|
1731 |
uninstall: |
1732 |
|
1733 |
|
1734 |
|
1735 |
1.1 sci-physics/root/files/xrootd-20071116-checksymbol.patch |
1736 |
|
1737 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-physics/root/files/xrootd-20071116-checksymbol.patch?rev=1.1&view=markup |
1738 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-physics/root/files/xrootd-20071116-checksymbol.patch?rev=1.1&content-type=text/plain |
1739 |
|
1740 |
Index: xrootd-20071116-checksymbol.patch |
1741 |
=================================================================== |
1742 |
--- xrootd/configure.classic.orig 2008-05-26 15:52:33.337003344 +0000 |
1743 |
+++ xrootd/configure.classic 2008-05-26 22:17:49.601277080 +0000 |
1744 |
@@ -339,7 +339,8 @@ |
1745 |
|
1746 |
# Assert that we got enough arguments |
1747 |
if test $# -ne 3 ; then |
1748 |
- echo "check_symbol: Not 3 arguments" |
1749 |
+ echo "check_symbol: not 3 arguments" |
1750 |
+ found_symbol=0 |
1751 |
return 1 |
1752 |
fi |
1753 |
|
1754 |
@@ -348,34 +349,105 @@ |
1755 |
symbollib=$1 ; shift |
1756 |
symboldir=$1 |
1757 |
|
1758 |
+ if test "x$symbollib" = "x" ; then |
1759 |
+ found_symbol=0 |
1760 |
+ return 1 |
1761 |
+ fi |
1762 |
+ |
1763 |
+ symbollib=`echo $symbollib | sed -e 's/^-l/lib/'` |
1764 |
+ |
1765 |
+ if test ! "x$symboldir" = "x" ; then |
1766 |
+ symboldir=`echo $symboldir | sed -e 's/^-L//'` |
1767 |
+ fi |
1768 |
+ |
1769 |
# Check if we got a specific argument as to where the library |
1770 |
# is to be found |
1771 |
symbolfile=$symbollib |
1772 |
- if test ! "x$symboldir" = "x" ; then |
1773 |
- symbolfile=$symboldir/$symbollib |
1774 |
- if test ! -r $symbolfile ; then |
1775 |
- for i in .a .so .lib ; do |
1776 |
- if test -r $symbolfile$i ; then |
1777 |
- symbolfile=$symbolfile$i |
1778 |
- break |
1779 |
+ exts=".so .lib" |
1780 |
+ if test ! "x$shared" = "xno" ; then |
1781 |
+ exts="$exts .a" |
1782 |
+ else |
1783 |
+ exts=".a $exts" |
1784 |
+ fi |
1785 |
+ |
1786 |
+ usrlib="/usr/lib" |
1787 |
+ # look first in the lib32 directories |
1788 |
+ if test "x$checklib32" = "xyes" ; then |
1789 |
+ usrlib="/usr/lib32 $usrlib" |
1790 |
+ fi |
1791 |
+ # look first in the lib64 directories |
1792 |
+ if test "x$checklib64" = "xyes" ; then |
1793 |
+ usrlib="/usr/lib64 $usrlib" |
1794 |
+ fi |
1795 |
+ # look only in the lib64 directories |
1796 |
+ if test "x$checkonlylib64" = "xyes" ; then |
1797 |
+ usrlib="/usr/lib64" |
1798 |
+ fi |
1799 |
+ # look only in the hpux64 directories |
1800 |
+ if test "x$checkhpux64" = "xyes" ; then |
1801 |
+ usrlib="/usr/lib/hpux64" |
1802 |
+ fi |
1803 |
+ |
1804 |
+ for d in "$symboldir" $usrlib ; do |
1805 |
+ echo " Checking in $d" |
1806 |
+ if test ! -r $d/$symbollib ; then |
1807 |
+ echo " $d/$symbollib not readable" |
1808 |
+ for i in $exts ; do |
1809 |
+ echo " Checking extension $i with $d/$symbollib" |
1810 |
+ if test -r $d/$symbollib$i ; then |
1811 |
+ echo " $d/$symbollib$i readable" |
1812 |
+ symbolfile=$d/$symbollib$i |
1813 |
+ break 2 |
1814 |
fi |
1815 |
done |
1816 |
+ else |
1817 |
+ echo "$d/$symbollib readable" |
1818 |
+ symbolfile=$d/$symbollib |
1819 |
+ break |
1820 |
fi |
1821 |
- fi |
1822 |
+ done |
1823 |
|
1824 |
if test "x$symbolfile" = "x" || test ! -r $symbolfile ; then |
1825 |
found_symbol=0 |
1826 |
+ echo " Symbol not found" |
1827 |
return 1 |
1828 |
fi |
1829 |
|
1830 |
- symbol_in_lib=`nm $symbolfile | grep $symbol > /dev/null 2>&1` |
1831 |
+ checking_msg "$symbol in $symbolfile" |
1832 |
+ nm $symbolfile 2>&1 | grep $symbol > /dev/null 2>&1 |
1833 |
if test $? -eq 0 ; then |
1834 |
found_symbol=1 |
1835 |
+ echo " Symbol found" |
1836 |
else |
1837 |
- found_symbol=0 |
1838 |
+ nm $symbolfile 2>&1 | grep "no symbols" > /dev/null 2>&1 |
1839 |
+ if test $? -eq 0 ; then |
1840 |
+ echo " $symbolfile is stripped, trying a link" |
1841 |
+ # stripped library - only safe test is to link against the |
1842 |
+ # library! However, we do not know what compiler to use |
1843 |
+ # so we can not do the test. Assume the symbol is in |
1844 |
+ cat <<EOF > conftest.mk |
1845 |
+conftest:conftest.c $symbolfile |
1846 |
+ \$(CC) \$(CFLAGS) \$(LDFLAGS) $symbolfile \$< -o \$@ |
1847 |
+ |
1848 |
+conftest.c: |
1849 |
+ echo "extern int $symbol (); " > \$@ |
1850 |
+ echo "int main() { $symbol (); return 0; }" >> \$@ |
1851 |
+EOF |
1852 |
+ make -f conftest.mk >> config.log 2>&1 |
1853 |
+ if test $? -eq 0 ; then |
1854 |
+ found_symbol=1 |
1855 |
+ echo " Link OK" |
1856 |
+ else |
1857 |
+ found_symbol=0 |
1858 |
+ echo " Failed code was" |
1859 |
+ cat conftest.mk >> config.log |
1860 |
+ fi |
1861 |
+ rm -rf conftest.c conftest.mk conftest |
1862 |
+ else |
1863 |
+ found_symbol=0 |
1864 |
+ fi |
1865 |
fi |
1866 |
} |
1867 |
- |
1868 |
#_____________________________________________________________________ |
1869 |
guess_architecture () { |
1870 |
# Try to guess the architecture of the host system |
1871 |
|
1872 |
|
1873 |
|
1874 |
-- |
1875 |
gentoo-commits@l.g.o mailing list |