summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordinoex <dinoex@FreeBSD.org>2004-10-08 18:41:38 +0000
committerdinoex <dinoex@FreeBSD.org>2004-10-08 18:41:38 +0000
commite64c670ec40ae7c6d79bf2e0491145e8f4fc3729 (patch)
tree6e87fd4ff44fccf2f2ab3879ffe252622b867609
parent435aa1d814254fc6b5d4d15dc1c790fc285961c1 (diff)
downloadFreeBSD-ports-e64c670ec40ae7c6d79bf2e0491145e8f4fc3729.zip
FreeBSD-ports-e64c670ec40ae7c6d79bf2e0491145e8f4fc3729.tar.gz
- Fix build under gcc34
PR: 72449 Submitted by: Michael Johnson Approved by: portmgr (marcus) Obtained from: vls cvs
-rw-r--r--net/vls/Makefile3
-rw-r--r--net/vls/files/patch-gcc3485
2 files changed, 87 insertions, 1 deletions
diff --git a/net/vls/Makefile b/net/vls/Makefile
index 8a5745b..cd45641 100644
--- a/net/vls/Makefile
+++ b/net/vls/Makefile
@@ -48,7 +48,8 @@ CONFIGURE_ENV+= VLS_LIB="-L/usr/lib -lcipher"
.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 --git a/net/vls/files/patch-gcc34 b/net/vls/files/patch-gcc34
new file mode 100644
index 0000000..618f7ee
--- /dev/null
+++ b/net/vls/files/patch-gcc34
@@ -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)
OpenPOWER on IntegriCloud