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
commitcaee2184754ffa8c9a79498e6de2fec7a44e0053 (patch)
treed9144d22e992366756a942be5f759f2a09155f59 /net-libs/wvstreams
parentVersion bump to git version which includes fixes for Rails 2.3.8. (diff)
downloadhistorical-caee2184754ffa8c9a79498e6de2fec7a44e0053.tar.gz
historical-caee2184754ffa8c9a79498e6de2fec7a44e0053.tar.bz2
historical-caee2184754ffa8c9a79498e6de2fec7a44e0053.zip
Fix building with recent glibc wrt #333301 by Willard Dawson.
Package-Manager: portage-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/Manifest5
-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
4 files changed, 34 insertions, 5 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/Manifest b/net-libs/wvstreams/Manifest
index 48c8795c953e..d5b7be35257c 100644
--- a/net-libs/wvstreams/Manifest
+++ b/net-libs/wvstreams/Manifest
@@ -1,7 +1,8 @@
+AUX wvstreams-4.6.1-glibc212.patch 489 RMD160 ffe2e01f4c265f2963a43aa52ad54c7d84645d0f SHA1 366c599b28c39a3f0c31ad67d7e38d7e0d37960b SHA256 1090e2b4bcf94e21f18ebc81a1bf6c6ae8763b8e98a5b05ab6d57ff6425cda6a
AUX wvstreams-4.6.1-openssl-1.0.0.patch 470 RMD160 360e22417bb45eba87eade0c475464b36c026c38 SHA1 0bbbc7ca86181edab61152fa31675bdc906d3c51 SHA256 992a3ae041e0c859991ca0325590dc6e498214eadcc56395956dd23f6bdbd098
AUX wvstreams-4.6.1-parallel-make.patch 2236 RMD160 fc1082804587b0f392e4cc358fb56d0a4aba2801 SHA1 3c57a5a237059616fcc1cc76b6f08a35a39dc019 SHA256 aaefbb5aa45a7f377b91a11671d25cfe62856a5c801271b1be783eccc1acd7a0
DIST wvstreams-4.6.1.tar.gz 1118456 RMD160 55550608ccfa53c7daf0ee195466f077b3540acb SHA1 1431efc3f46a13b6a8dbcad4123e19473369f767 SHA256 8403f5fbf83aa9ac0c6ce15d97fd85607488152aa84e007b7d0621b8ebc07633
-EBUILD wvstreams-4.6.1-r1.ebuild 2130 RMD160 46aa4200e5aab02ae4456c9a236f12f52446a000 SHA1 6d6e416e62875230206b6d0e199e2ceadf58e759 SHA256 67d6a174ce3f36bd8b2345773798125f06a877715c85c5af83b1bb2e540fb13f
+EBUILD wvstreams-4.6.1-r1.ebuild 2172 RMD160 5ffe4a6fabee61f3496529f85f0ae9c26fdbe142 SHA1 57d16c4534e7ffee67504ba2440b607014735b3f SHA256 d3d90be772e313ba97b0b7a0367b81ad8bf85263f4ec86d3f638c35f6c02e5ff
EBUILD wvstreams-4.6.1.ebuild 2076 RMD160 c7e6769a9e536ab7e5496d8a52d6c2e24732246e SHA1 b8bdc11c8c69789ac53059da756db0f012facc57 SHA256 00d34e42622e2a12579bd080c2225076e79f69c72ee4cd55eb977e9c7522b1be
-MISC ChangeLog 24322 RMD160 85a2591301603bd69b62eca86cfa5f137457a46c SHA1 eb3f84598dfd0db71ab2c5c2089163b971e51f2c SHA256 af20401b9b6627c3f5d7a5fa829576a23e8688dfbd4718978b25951f49b38edc
+MISC ChangeLog 24515 RMD160 d9c0ee337051a918a1f130ef696077880f3c82d6 SHA1 ce9fc63040494bb955cfdc21b94ca25981fea5b8 SHA256 ea6f8810c7bbba32b977353a84aae753764b304abb43e3a6a19045a80c8abe3e
MISC metadata.xml 228 RMD160 62154bc737c6b25b3d4d0b938cb62a241c83ad15 SHA1 0bb4f84f2396dc72009f54c9efdadf50e203ae8e SHA256 98b56a813b3de314223d7193a3a055e191c9647a2f6887bf8dc7b05f8d0ec610
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