summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2010-08-18 11:56:47 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2010-08-18 11:56:47 +0000
commitbe8e33b20db4c68dc96b5546a63b4b4ff1b4869b (patch)
tree0d53d5125ab577c1d1c1c49b2c074d0c8b3ae98b /net-libs/wvstreams
parentVersion bump to git version which includes fixes for Rails 2.3.8. (diff)
downloadgentoo-2-be8e33b20db4c68dc96b5546a63b4b4ff1b4869b.tar.gz
gentoo-2-be8e33b20db4c68dc96b5546a63b4b4ff1b4869b.tar.bz2
gentoo-2-be8e33b20db4c68dc96b5546a63b4b4ff1b4869b.zip
Fix building with recent glibc wrt #333301 by Willard Dawson.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'net-libs/wvstreams')
-rw-r--r--net-libs/wvstreams/ChangeLog6
-rw-r--r--net-libs/wvstreams/files/wvstreams-4.6.1-glibc212.patch23
-rw-r--r--net-libs/wvstreams/wvstreams-4.6.1-r1.ebuild5
3 files changed, 31 insertions, 3 deletions
diff --git a/net-libs/wvstreams/ChangeLog b/net-libs/wvstreams/ChangeLog
index dccbfa383b3d..575abc89c9ca 100644
--- a/net-libs/wvstreams/ChangeLog
+++ b/net-libs/wvstreams/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-libs/wvstreams
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/ChangeLog,v 1.136 2010/07/10 15:54:54 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/ChangeLog,v 1.137 2010/08/18 11:56:47 ssuominen Exp $
+
+ 18 Aug 2010; Samuli Suominen <ssuominen@gentoo.org>
+ wvstreams-4.6.1-r1.ebuild, +files/wvstreams-4.6.1-glibc212.patch:
+ Fix building with recent glibc wrt #333301 by Willard Dawson.
10 Jul 2010; Jeroen Roovers <jer@gentoo.org> wvstreams-4.6.1.ebuild:
Stable for HPPA (bug #321637).
diff --git a/net-libs/wvstreams/files/wvstreams-4.6.1-glibc212.patch b/net-libs/wvstreams/files/wvstreams-4.6.1-glibc212.patch
new file mode 100644
index 000000000000..473d3e832933
--- /dev/null
+++ b/net-libs/wvstreams/files/wvstreams-4.6.1-glibc212.patch
@@ -0,0 +1,23 @@
+http://bugs.gentoo.org/333301
+
+--- ipstreams/wvunixdgsocket.cc
++++ ipstreams/wvunixdgsocket.cc
+@@ -1,5 +1,5 @@
+ #include "wvunixdgsocket.h"
+-#ifdef MACOS
++#if defined(MACOS) || defined(__GNUC__)
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #endif
+--- streams/wvatomicfile.cc
++++ streams/wvatomicfile.cc
+@@ -11,7 +11,8 @@
+ #include "wvfileutils.h"
+ #include "wvstrutils.h"
+
+-#ifdef MACOS
++#if defined(MACOS) || defined(__GNUC__)
++#include <sys/types.h>
+ #include <sys/stat.h>
+ #endif
+
diff --git a/net-libs/wvstreams/wvstreams-4.6.1-r1.ebuild b/net-libs/wvstreams/wvstreams-4.6.1-r1.ebuild
index 4f4d21489663..b20df083223c 100644
--- a/net-libs/wvstreams/wvstreams-4.6.1-r1.ebuild
+++ b/net-libs/wvstreams/wvstreams-4.6.1-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/wvstreams-4.6.1-r1.ebuild,v 1.1 2010/06/04 12:54:18 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/wvstreams-4.6.1-r1.ebuild,v 1.2 2010/08/18 11:56:47 ssuominen Exp $
EAPI=2
inherit autotools toolchain-funcs versionator
@@ -45,7 +45,8 @@ pkg_setup() {
src_prepare() {
epatch "${FILESDIR}"/${P}-parallel-make.patch \
- "${FILESDIR}"/${P}-openssl-1.0.0.patch
+ "${FILESDIR}"/${P}-openssl-1.0.0.patch \
+ "${FILESDIR}"/${P}-glibc212.patch
eautoreconf
cd argp
eautoreconf