summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas K. Hüttel <dilfridge@gentoo.org>2012-06-24 20:22:28 +0000
committerAndreas K. Hüttel <dilfridge@gentoo.org>2012-06-24 20:22:28 +0000
commitf069300217732c563fbe84bc0d1665e1f1060d0d (patch)
treeede61824d8f679f00dc72b24777c3e385e3d7b01 /net-firewall
parentDrop perl-5.16 build fix since it was applied upstream. (diff)
downloadgentoo-2-f069300217732c563fbe84bc0d1665e1f1060d0d.tar.gz
gentoo-2-f069300217732c563fbe84bc0d1665e1f1060d0d.tar.bz2
gentoo-2-f069300217732c563fbe84bc0d1665e1f1060d0d.zip
Fix build with gcc-4.7, bug 419667
(Portage version: 2.2.0_alpha110/cvs/Linux x86_64)
Diffstat (limited to 'net-firewall')
-rw-r--r--net-firewall/fwbuilder/ChangeLog6
-rw-r--r--net-firewall/fwbuilder/files/fwbuilder-5.0.1.3592-gcc47.patch11
-rw-r--r--net-firewall/fwbuilder/fwbuilder-5.0.1.3592-r1.ebuild3
3 files changed, 18 insertions, 2 deletions
diff --git a/net-firewall/fwbuilder/ChangeLog b/net-firewall/fwbuilder/ChangeLog
index aaf749fd4be2..eea554b7130a 100644
--- a/net-firewall/fwbuilder/ChangeLog
+++ b/net-firewall/fwbuilder/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-firewall/fwbuilder
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/ChangeLog,v 1.119 2012/06/08 12:05:08 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/ChangeLog,v 1.120 2012/06/24 20:22:28 dilfridge Exp $
+
+ 24 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+ fwbuilder-5.0.1.3592-r1.ebuild, +files/fwbuilder-5.0.1.3592-gcc47.patch:
+ Fix build with gcc-4.7, bug 419667
08 Jun 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org>
fwbuilder-5.0.1.3592-r1.ebuild:
diff --git a/net-firewall/fwbuilder/files/fwbuilder-5.0.1.3592-gcc47.patch b/net-firewall/fwbuilder/files/fwbuilder-5.0.1.3592-gcc47.patch
new file mode 100644
index 000000000000..7849e2b6da95
--- /dev/null
+++ b/net-firewall/fwbuilder/files/fwbuilder-5.0.1.3592-gcc47.patch
@@ -0,0 +1,11 @@
+--- a/src/libfwbuilder/src/fwbuilder/ThreadTools.h 2012-06-04 15:02:55.909203733 -0400
++++ b/src/libfwbuilder/src/fwbuilder/ThreadTools.h 2012-06-04 15:04:54.079198998 -0400
+@@ -31,7 +31,7 @@
+
+ #include <time.h> //for time_t definition
+ #include <pthread.h>
+-
++#include <unistd.h>
+ #include <string>
+ #include <queue>
+
diff --git a/net-firewall/fwbuilder/fwbuilder-5.0.1.3592-r1.ebuild b/net-firewall/fwbuilder/fwbuilder-5.0.1.3592-r1.ebuild
index 0c2cc855fec2..30da16c75bf9 100644
--- a/net-firewall/fwbuilder/fwbuilder-5.0.1.3592-r1.ebuild
+++ b/net-firewall/fwbuilder/fwbuilder-5.0.1.3592-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/fwbuilder-5.0.1.3592-r1.ebuild,v 1.5 2012/06/08 12:05:08 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/fwbuilder-5.0.1.3592-r1.ebuild,v 1.6 2012/06/24 20:22:28 dilfridge Exp $
EAPI="4"
@@ -21,6 +21,7 @@ RDEPEND="${DEPEND}"
PATCHES=(
"${FILESDIR}/${PN}-5.0.0.3568-ldflags.patch"
+ "${FILESDIR}/${PN}-5.0.1.3592-gcc47.patch"
)
src_prepare() {