Date: Fri, 8 Oct 2004 11:16:25 -0400 (EDT) From: Michael Johnson <ahze@ahze.net> To: FreeBSD-gnats-submit@FreeBSD.org Cc: dinoex@FreeBSD.org Subject: ports/72449: [PATCH] net/vls: [Fix build on 5.3] Message-ID: <200410081516.i98FGP2k010045@blueheron.ahze.net> Resent-Message-ID: <200410081520.i98FKSmo041501@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 72449
>Category: ports
>Synopsis: [PATCH] net/vls: [Fix build on 5.3]
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Fri Oct 08 15:20:27 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: Michael Johnson
>Release: FreeBSD 5.3-BETA6 i386
>Organization:
>Environment:
System: FreeBSD blueheron.ahze.net 5.3-BETA6 FreeBSD 5.3-BETA6 #67: Fri Oct 1 15:03:41 EDT
>Description:
- Fix build on 5.3 (gcc34)
This patch uses -fpermissive, but it works.
Added file(s):
- files/patch-gcc34
mostly obtained from vls cvs
Port maintainer (dinoex@FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:
--- vls-0.5.6.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/net/vls.orig/Makefile /usr/ports/net/vls/Makefile
--- /usr/ports/net/vls.orig/Makefile Fri Oct 8 11:12:29 2004
+++ /usr/ports/net/vls/Makefile Fri Oct 8 11:13:25 2004
@@ -48,7 +48,8 @@
.endif
.if ${OSVERSION} >= 502122
-BROKEN= new gcc: an explicit specialization must be preceded by template
+# allow nonconforming code to compile
+CFLAGS+= -fpermissive
.endif
.include <bsd.port.post.mk>
diff -ruN --exclude=CVS /usr/ports/net/vls.orig/files/patch-gcc34 /usr/ports/net/vls/files/patch-gcc34
--- /usr/ports/net/vls.orig/files/patch-gcc34 Wed Dec 31 19:00:00 1969
+++ /usr/ports/net/vls/files/patch-gcc34 Fri Oct 8 11:05:49 2004
@@ -0,0 +1,85 @@
+--- src/core/hashtable.h.orig Fri Oct 8 10:37:06 2004
++++ src/core/hashtable.h Fri Oct 8 10:37:16 2004
+@@ -2,7 +2,7 @@
+ * hashtable.h: Hashtable class definition
+ *-------------------------------------------------------------------------------
+ * (c)1999-2001 VideoLAN
+-* $Id: hashtable.h,v 1.1 2001/10/06 21:23:36 bozo Exp $
++* $Id$
+ *
+ * Authors: Benoit Steiner <benny@via.ecp.fr>
+ *
+@@ -63,7 +63,7 @@
+ };
+
+
+-class C_HashMethod<u32>
++template <> class C_HashMethod<u32>
+ {
+ public:
+ inline C_HashMethod(u32 uiMaxHash);
+@@ -76,7 +76,7 @@
+ };
+
+
+-class C_HashMethod<u16>
++template <> class C_HashMethod<u16>
+ {
+ public:
+ inline C_HashMethod(u32 uiMaxHash);
+@@ -89,7 +89,7 @@
+ };
+
+
+-class C_HashMethod<handle>
++template <> class C_HashMethod<handle>
+ {
+ public:
+ inline C_HashMethod(u32 uiMaxHash);
+--- src/core/library.cpp.orig Fri Oct 8 10:49:59 2004
++++ src/core/library.cpp Fri Oct 8 10:51:20 2004
+@@ -34,6 +34,7 @@
+ // use the template: look at vector.h for further explanation
+
+
++#define DL_LAZY 1
+
+ //******************************************************************************
+ // class C_Library
+--- src/core/stream.cpp.orig Fri Oct 8 11:03:00 2004
++++ src/core/stream.cpp Fri Oct 8 11:04:48 2004
+@@ -2,7 +2,7 @@
+ * stream.cpp: Stream class
+ *-------------------------------------------------------------------------------
+ * (c)1999-2001 VideoLAN
+-* $Id: stream.cpp,v 1.3 2002/09/04 10:56:34 jpsaman Exp $
++* $Id$
+ *
+ * Authors: Benoit Steiner <benny@via.ecp.fr>
+ *
+@@ -319,7 +319,7 @@
+ {
+ try
+ {
+- u32 iByteCount = cSerializer.NextBytesCount();
++ u32 iByteCount = this->cSerializer.NextBytesCount();
+ while(iByteCount > 0)
+ {
+ const byte aBytes[iByteCount];
+@@ -332,13 +332,13 @@
+ ASSERT(iRc >= 0 || iRc == FILE_EOF);
+ iOffset += iRc;
+ }
+- while(iByteCount > 0 && iRc != FILE_EOF);
++ while(iByteCount > 0 && this->iRc != FILE_EOF);
+
+ // Deserialize them
+- cSerializer.SetNextBytes(&aBytes);
++ this->cSerializer.SetNextBytes(&aBytes);
+
+ // Next iteration
+- iByteCount = cSerializer.NextBytesCount();
++ iByteCount = this->cSerializer.NextBytesCount();
+ }
+ }
+ catch(E_Exception e)
--- vls-0.5.6.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200410081516.i98FGP2k010045>