summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Alfredsen <loki_val@gentoo.org>2009-02-15 20:41:23 +0000
committerPeter Alfredsen <loki_val@gentoo.org>2009-02-15 20:41:23 +0000
commit48dca5258b9dcc6aa0448f07032804eb9caf6b47 (patch)
tree368c6ffb2442a804e4c789c39a8b340408a7ef95
parentFix build with GCC 4.3. Patch by Arttu Valo in bug #251705 (diff)
downloadgentoo-2-48dca5258b9dcc6aa0448f07032804eb9caf6b47.tar.gz
gentoo-2-48dca5258b9dcc6aa0448f07032804eb9caf6b47.tar.bz2
gentoo-2-48dca5258b9dcc6aa0448f07032804eb9caf6b47.zip
Adding gcc-4.3 patch per bug 251442. Thanks to Gene Seto <geneseto@hotmail.com> for the patch.
(Portage version: 2.2_rc23/cvs/Linux x86_64)
-rw-r--r--net-firewall/itval/ChangeLog9
-rw-r--r--net-firewall/itval/files/itval-1.0-gcc43.patch26
-rw-r--r--net-firewall/itval/itval-1.0.ebuild10
3 files changed, 41 insertions, 4 deletions
diff --git a/net-firewall/itval/ChangeLog b/net-firewall/itval/ChangeLog
index 82b8217de685..6faf346753a4 100644
--- a/net-firewall/itval/ChangeLog
+++ b/net-firewall/itval/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for net-firewall/itval
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/itval/ChangeLog,v 1.1 2007/05/23 09:12:37 jokey Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/itval/ChangeLog,v 1.2 2009/02/15 20:41:23 loki_val Exp $
+
+ 15 Feb 2009; Peter Alfredsen <loki_val@gentoo.org>
+ +files/itval-1.0-gcc43.patch, itval-1.0.ebuild:
+ Adding gcc-4.3 patch per bug 251442. Thanks to Gene Seto
+ <geneseto@hotmail.com> for the patch.
*itval-1.0 (23 May 2007)
diff --git a/net-firewall/itval/files/itval-1.0-gcc43.patch b/net-firewall/itval/files/itval-1.0-gcc43.patch
new file mode 100644
index 000000000000..d8a892b0b75e
--- /dev/null
+++ b/net-firewall/itval/files/itval-1.0-gcc43.patch
@@ -0,0 +1,26 @@
+/usr/include/alloca.h:
+diff -rupN ITVal-1.0b/FDDL/api.cc ITVal-1.0/FDDL/api.cc
+--- ITVal-1.0b/FDDL/api.cc 2009-01-22 17:22:54.000000000 -0400
++++ ITVal-1.0/FDDL/api.cc 2009-01-22 17:24:09.000000000 -0400
+@@ -26,8 +26,8 @@ College of William and Mary
+ Williamsburg, VA 23185
+ */
+
+-#include <stdio.h>
+ #include <assert.h>
++#include <climits>
+ #include <FDDL/mdd.h>
+
+ #define MAX(a, b) (a>b ? a : b)
+diff -rupN ITVal-1.0b/src/fwmdd.h ITVal-1.0/src/fwmdd.h
+--- ITVal-1.0b/src/fwmdd.h 2009-01-22 17:22:54.000000000 -0400
++++ ITVal-1.0/src/fwmdd.h 2009-01-22 17:27:51.000000000 -0400
+@@ -135,7 +135,7 @@ class fw_fddl_forest:public fddl_forest
+ int InternalGetServiceArcs(level k, node_idx p, int* src, int* dst,
+ int* low, int* high, service*&output, int& numArcs);
+ void PrintPort (mdd_handle h, level k);
+- int PrintPort (level k, node_idx p, int highByte, int depth, portset * p);
++ int PrintPort (level k, node_idx p, int highByte, int depth, portset * ps);
+ };
+
+ #endif
diff --git a/net-firewall/itval/itval-1.0.ebuild b/net-firewall/itval/itval-1.0.ebuild
index 76e14dce9b5f..d9ca58fd1b04 100644
--- a/net-firewall/itval/itval-1.0.ebuild
+++ b/net-firewall/itval/itval-1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/itval/itval-1.0.ebuild,v 1.1 2007/05/23 09:12:37 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/itval/itval-1.0.ebuild,v 1.2 2009/02/15 20:41:23 loki_val Exp $
inherit eutils flag-o-matic
@@ -18,6 +18,12 @@ DEPEND="sys-devel/bison
S=${WORKDIR}/ITVal-${PV}
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+ epatch "${FILESDIR}/${P}-gcc43.patch"
+}
+
src_install(){
make DESTDIR="${D}" install || die "make install failed"
doman itval.n