summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Hill <dirtyepic@gentoo.org>2013-03-03 06:30:56 +0000
committerRyan Hill <dirtyepic@gentoo.org>2013-03-03 06:30:56 +0000
commit24cbca5d6dde1c6534b3b044d937e22e1a5109ad (patch)
tree5848bc10ed14a17de739e52279cdf0ddb636b73c /dev-libs/socketstream
parentFix build with GCC 4.7 (bug #426368). (diff)
downloadgentoo-2-24cbca5d6dde1c6534b3b044d937e22e1a5109ad.tar.gz
gentoo-2-24cbca5d6dde1c6534b3b044d937e22e1a5109ad.tar.bz2
gentoo-2-24cbca5d6dde1c6534b3b044d937e22e1a5109ad.zip
Fix build with GCC 4.7 (bug #429292).
(Portage version: 2.2.0_alpha164/cvs/Linux x86_64, signed Manifest commit with key 957A8463)
Diffstat (limited to 'dev-libs/socketstream')
-rw-r--r--dev-libs/socketstream/ChangeLog8
-rw-r--r--dev-libs/socketstream/files/socketstream-0.7.0-gcc47.patch15
-rw-r--r--dev-libs/socketstream/socketstream-0.7.0-r1.ebuild7
3 files changed, 25 insertions, 5 deletions
diff --git a/dev-libs/socketstream/ChangeLog b/dev-libs/socketstream/ChangeLog
index 3c41cc4c0c32..024810a70cfc 100644
--- a/dev-libs/socketstream/ChangeLog
+++ b/dev-libs/socketstream/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-libs/socketstream
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/socketstream/ChangeLog,v 1.15 2008/06/16 20:14:10 dev-zero Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/socketstream/ChangeLog,v 1.16 2013/03/03 06:30:56 dirtyepic Exp $
+
+ 03 Mar 2013; Ryan Hill <dirtyepic@gentoo.org> socketstream-0.7.0-r1.ebuild,
+ +files/socketstream-0.7.0-gcc47.patch:
+ Fix build with GCC 4.7 (bug #429292).
16 Jun 2008; Tiziano Müller <dev-zero@gentoo.org>
+files/0.7.0-missing_includes.patch, -socketstream-0.3.0.ebuild,
diff --git a/dev-libs/socketstream/files/socketstream-0.7.0-gcc47.patch b/dev-libs/socketstream/files/socketstream-0.7.0-gcc47.patch
new file mode 100644
index 000000000000..248450847e0b
--- /dev/null
+++ b/dev-libs/socketstream/files/socketstream-0.7.0-gcc47.patch
@@ -0,0 +1,15 @@
+ https://bugs.gentoo.org/429292
+
+ src/basic_socket.cc | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/src/basic_socket.cc
++++ b/src/basic_socket.cc
+@@ -22,6 +22,7 @@
+ * @doctodo
+ */
+
++#include <unistd.h>
+ #include <socketstream/basic_socket.h>
+
+ namespace ss {
diff --git a/dev-libs/socketstream/socketstream-0.7.0-r1.ebuild b/dev-libs/socketstream/socketstream-0.7.0-r1.ebuild
index 7530a2ce9b00..2596c77b55ac 100644
--- a/dev-libs/socketstream/socketstream-0.7.0-r1.ebuild
+++ b/dev-libs/socketstream/socketstream-0.7.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/socketstream/socketstream-0.7.0-r1.ebuild,v 1.6 2008/06/16 20:14:10 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/socketstream/socketstream-0.7.0-r1.ebuild,v 1.7 2013/03/03 06:30:56 dirtyepic Exp $
inherit eutils
@@ -23,7 +23,8 @@ src_unpack() {
sed -i 's|^DIST_\(SUBDIRS =\)|\1|' include/Makefile.in || \
die "sed include/Makefile.in failed"
- epatch "${FILESDIR}/${PV}-missing_includes.patch"
+ epatch "${FILESDIR}"/${PV}-missing_includes.patch
+ epatch "${FILESDIR}"/${P}-gcc47.patch
}
src_compile() {