summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Alfredsen <loki_val@gentoo.org>2008-07-20 14:38:56 +0000
committerPeter Alfredsen <loki_val@gentoo.org>2008-07-20 14:38:56 +0000
commitd84b4e26fbfc21c71583817735c6c77439daac07 (patch)
tree9776feaf87fc8ba9503e06c15d627fd30fb53f92 /net-misc
parentFix website (diff)
downloadgentoo-2-d84b4e26fbfc21c71583817735c6c77439daac07.tar.gz
gentoo-2-d84b4e26fbfc21c71583817735c6c77439daac07.tar.bz2
gentoo-2-d84b4e26fbfc21c71583817735c6c77439daac07.zip
Fix to compile with gcc-4.3. Bug 231428. Thanks to Bernd Buschinski <b.buschinski@web.de>
(Portage version: 2.2_rc1/cvs/Linux 2.6.25.8 i686)
Diffstat (limited to 'net-misc')
-rw-r--r--net-misc/vde/ChangeLog7
-rw-r--r--net-misc/vde/files/vde-2.1.6-gcc43.patch35
-rw-r--r--net-misc/vde/vde-2.1.6-r1.ebuild5
3 files changed, 44 insertions, 3 deletions
diff --git a/net-misc/vde/ChangeLog b/net-misc/vde/ChangeLog
index c2b2205318e9..4d53166ec817 100644
--- a/net-misc/vde/ChangeLog
+++ b/net-misc/vde/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for net-misc/vde
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vde/ChangeLog,v 1.13 2008/03/11 21:34:48 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vde/ChangeLog,v 1.14 2008/07/20 14:38:55 loki_val Exp $
+
+ 20 Jul 2008; Peter Alfredsen <loki_val@gentoo.org>
+ +files/vde-2.1.6-gcc43.patch, vde-2.1.6-r1.ebuild:
+ Fix to compile with gcc-4.3. Bug 231428. Thanks to Bernd Buschinski
+ <b.buschinski@web.de>
11 Mar 2008; Stefan Schweizer <genstef@gentoo.org> files/vde.init:
needs to start after net.tap according to Etaoin Shrdlu
diff --git a/net-misc/vde/files/vde-2.1.6-gcc43.patch b/net-misc/vde/files/vde-2.1.6-gcc43.patch
new file mode 100644
index 000000000000..80122b26c75d
--- /dev/null
+++ b/net-misc/vde/files/vde-2.1.6-gcc43.patch
@@ -0,0 +1,35 @@
+--- slirpvde/slirpvde.c 2006-12-18 16:24:27.000000000 +0100
++++ slirpvde/slirpvde.c 2008-07-10 15:44:39.000000000 +0200
+@@ -32,8 +32,8 @@
+
+ #include "misc.h"
+
++#include <limits.h>
+ #ifdef VDE_DARWIN
+-# include <limits.h>
+ # if defined HAVE_SYSLIMITS_H
+ # include <syslimits.h>
+ # elif defined HAVE_SYS_SYSLIMITS_H
+--- vde_plug2tap/vde_plug2tap.c 2006-12-18 14:49:57.000000000 +0100
++++ vde_plug2tap/vde_plug2tap.c 2008-07-10 15:45:12.000000000 +0200
+@@ -30,9 +30,9 @@
+ #include <linux/if_tun.h>
+ #endif
+
++#include <limits.h>
+ #ifdef VDE_DARWIN
+ # define TAP_PREFIX "/dev/"
+-# include <limits.h>
+ # if defined HAVE_SYSLIMITS_H
+ # include <syslimits.h>
+ # elif defined HAVE_SYS_SYSLIMITS_H
+--- vdetaplib/libvdetap.c 2006-12-18 14:36:05.000000000 +0100
++++ vdetaplib/libvdetap.c 2008-07-10 15:47:24.000000000 +0200
+@@ -20,6 +20,7 @@
+ #include <linux/ioctl.h>
+ #include <linux/if.h>
+ #include <linux/if_tun.h>
++#include <limits.h>
+
+ #define TUNTAPPATH "/dev/net/tun"
+ #define VDETAPEXEC LIBEXECDIR "/vdetap"
diff --git a/net-misc/vde/vde-2.1.6-r1.ebuild b/net-misc/vde/vde-2.1.6-r1.ebuild
index 61a4b9813ae5..8f397511eefe 100644
--- a/net-misc/vde/vde-2.1.6-r1.ebuild
+++ b/net-misc/vde/vde-2.1.6-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vde/vde-2.1.6-r1.ebuild,v 1.2 2007/07/12 02:52:15 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vde/vde-2.1.6-r1.ebuild,v 1.3 2008/07/20 14:38:55 loki_val Exp $
inherit eutils
@@ -20,6 +20,7 @@ src_unpack() {
unpack ${A}
cd "${S}"
epatch "${FILESDIR}/Unixterm_20070403.patch"
+ epatch "${FILESDIR}/${P}-gcc43.patch"
}
src_install() {