OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 27-Sep-2005 14:44:19
Branch: HEAD Handle: 2005092713441900
Modified files:
openpkg-src/flowtools flowtools.patch flowtools.spec
Log:
ok, take the large hammer and get flow-tools finally to build under
new GCC 4.0 world order
Summary:
Revision Changes Path
1.12 +146 -0 openpkg-src/flowtools/flowtools.patch
1.18 +1 -1 openpkg-src/flowtools/flowtools.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/flowtools/flowtools.patch
============================================================================
$ cvs diff -u -r1.11 -r1.12 flowtools.patch
--- openpkg-src/flowtools/flowtools.patch 22 Jul 2005 14:48:58 -0000
1.11
+++ openpkg-src/flowtools/flowtools.patch 27 Sep 2005 12:44:19 -0000
1.12
@@ -397,3 +397,149 @@
return -1;
if (nest == -1)
+Index: flow-tools-0.68/lib/ftlib.h
+--- flow-tools-0.68/lib/ftlib.h.orig 2005-05-10 17:51:33 +0200
++++ flow-tools-0.68/lib/ftlib.h 2005-09-27 14:41:19 +0200
+@@ -3032,4 +3032,7 @@
+ /* MACHINE DEPENDANT */
+ #define fmt_uint fmt_uint32
+
++/* workaround GCC 4.0 "lvalue" constraints */
++#define CPTR_ADD(ptr,add) { char *_cp = (char *)(ptr); _cp += (add); (ptr)
= _cp; }
++
+ #endif /* FTLIB_H */
+
+Index: flow-tools-0.68/lib/ftio.c
+--- flow-tools-0.68/lib/ftio.c.orig 2003-02-24 01:51:47 +0100
++++ flow-tools-0.68/lib/ftio.c 2005-09-27 14:37:18 +0200
+@@ -2267,7 +2267,7 @@
+ break;
+
+ nleft -= nread;
+- (char*)ptr += nread;
++ CPTR_ADD(ptr, nread)
+ }
+ return (nbytes - nleft);
+ } /* readn */
+@@ -2292,7 +2292,7 @@
+ return(nwritten); /* error */
+
+ nleft -= nwritten;
+- (char*)ptr += nwritten;
++ CPTR_ADD(ptr, nwritten)
+ }
+ return(nbytes - nleft);
+ } /* writen */
+Index: flow-tools-0.68/lib/fttlv.c
+--- flow-tools-0.68/lib/fttlv.c.orig 2003-02-13 03:38:43 +0100
++++ flow-tools-0.68/lib/fttlv.c 2005-09-27 14:35:25 +0200
+@@ -68,10 +68,10 @@
+ }
+
+ bcopy(&t, buf, 2);
+- (char*)buf+= 2;
++ CPTR_ADD(buf, 2);
+
+ bcopy(&len, buf, 2);
+- (char*)buf+= 2;
++ CPTR_ADD(buf, 2);
+
+ bcopy(&v, buf, 4);
+
+@@ -107,10 +107,10 @@
+ }
+
+ bcopy(&t, buf, 2);
+- (char*)buf+= 2;
++ CPTR_ADD(buf, 2);
+
+ bcopy(&len, buf, 2);
+- (char*)buf+= 2;
++ CPTR_ADD(buf, 2);
+
+ bcopy(&v, buf, 2);
+
+@@ -145,10 +145,10 @@
+ }
+
+ bcopy(&t, buf, 2);
+- (char*)buf+= 2;
++ CPTR_ADD(buf, 2);
+
+ bcopy(&len, buf, 2);
+- (char*)buf+= 2;
++ CPTR_ADD(buf, 2);
+
+ bcopy(&v, buf, 1);
+
+@@ -183,10 +183,10 @@
+ }
+
+ bcopy(&t, buf, 2);
+- (char*)buf+= 2;
++ CPTR_ADD(buf, 2);
+
+ bcopy(&len, buf, 2);
+- (char*)buf+= 2;
++ CPTR_ADD(buf, 2);
+
+ bcopy(v, buf, len);
+
+@@ -230,16 +230,16 @@
+ return -1;
+
+ bcopy(&t, buf, 2);
+- (char*)buf+= 2;
++ CPTR_ADD(buf, 2);
+
+ bcopy(&len, buf, 2);
+- (char*)buf+= 2;
++ CPTR_ADD(buf, 2);
+
+ bcopy(&ip, buf, 4);
+- (char*)buf += 4;
++ CPTR_ADD(buf, 4);
+
+ bcopy(&ifIndex, buf, 2);
+- (char*)buf += 2;
++ CPTR_ADD(buf, 2);
+
+ bcopy(name, buf, n);
+
+@@ -287,19 +287,19 @@
+ }
+
+ bcopy(&t, buf, 2);
+- (char*)buf+= 2;
++ CPTR_ADD(buf, 2);
+
+ bcopy(&len, buf, 2);
+- (char*)buf+= 2;
++ CPTR_ADD(buf, 2);
+
+ bcopy(&ip, buf, 4);
+- (char*)buf += 4;
++ CPTR_ADD(buf, 4);
+
+ bcopy(&entries, buf, 2);
+- (char*)buf += 2;
++ CPTR_ADD(buf, 2);
+
+ bcopy(ifIndex_list, buf, esize);
+- (char*)buf += esize;
++ CPTR_ADD(buf, esize);
+
+ bcopy(name, buf, n);
+
+Index: flow-tools-0.68/lib/ftchash.c
+--- flow-tools-0.68/lib/ftchash.c.orig 2003-08-12 20:04:25 +0200
++++ flow-tools-0.68/lib/ftchash.c 2005-09-27 14:35:52 +0200
+@@ -326,7 +326,7 @@
+ (char*)ftch->traverse_chunk->base+ftch->traverse_chunk->next) {
+
+ ret = ftch->traverse_rec;
+- (char*)ftch->traverse_rec += ftch->d_size;
++ CPTR_ADD(ftch->traverse_rec, ftch->d_size);
+ return ret;
+
+ } else {
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/flowtools/flowtools.spec
============================================================================
$ cvs diff -u -r1.17 -r1.18 flowtools.spec
--- openpkg-src/flowtools/flowtools.spec 22 Jul 2005 14:48:58 -0000
1.17
+++ openpkg-src/flowtools/flowtools.spec 27 Sep 2005 12:44:19 -0000
1.18
@@ -38,7 +38,7 @@
Group: Network
License: BSD
Version: %{V_flowtools}
-Release: 20050722
+Release: 20050927
# package options
%option with_fsl yes
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
