summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPiotr Jaroszyński <peper@gentoo.org>2010-01-14 22:04:01 +0000
committerPiotr Jaroszyński <peper@gentoo.org>2010-01-14 22:04:01 +0000
commitcdb67881fbad150b9887ed295a8f7903e3c67e44 (patch)
tree208ede5b53f53946d8d49c6c46b66dda215d48ac /sys-apps
parentarm stable, bug #294958 (diff)
downloadgentoo-2-cdb67881fbad150b9887ed295a8f7903e3c67e44.tar.gz
gentoo-2-cdb67881fbad150b9887ed295a8f7903e3c67e44.tar.bz2
gentoo-2-cdb67881fbad150b9887ed295a8f7903e3c67e44.zip
Add a patch fixing gcc 4.1 compile time error.
(Portage version: 2.1.7.16/cvs/Linux x86_64)
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/paludis/ChangeLog6
-rw-r--r--sys-apps/paludis/files/paludis-0.44.0-gcc41-fix.patch23
-rw-r--r--sys-apps/paludis/paludis-0.44.0.ebuild8
3 files changed, 35 insertions, 2 deletions
diff --git a/sys-apps/paludis/ChangeLog b/sys-apps/paludis/ChangeLog
index e767070bc8cc..eac2af2c3676 100644
--- a/sys-apps/paludis/ChangeLog
+++ b/sys-apps/paludis/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-apps/paludis
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/ChangeLog,v 1.149 2010/01/09 16:50:09 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/ChangeLog,v 1.150 2010/01/14 22:04:00 peper Exp $
+
+ 14 Jan 2010; Piotr Jaroszyński <peper@gentoo.org> paludis-0.44.0.ebuild,
+ +files/paludis-0.44.0-gcc41-fix.patch:
+ Add a patch fixing gcc 4.1 compile time error.
*paludis-0.44.0 (09 Jan 2010)
diff --git a/sys-apps/paludis/files/paludis-0.44.0-gcc41-fix.patch b/sys-apps/paludis/files/paludis-0.44.0-gcc41-fix.patch
new file mode 100644
index 000000000000..8691f7c8d598
--- /dev/null
+++ b/sys-apps/paludis/files/paludis-0.44.0-gcc41-fix.patch
@@ -0,0 +1,23 @@
+commit 35402f6a25d9439c310216ed1f7c55222dde3db3
+Author: David Leverton <levertond@googlemail.com>
+Date: Tue Jan 12 22:34:02 2010 +0000
+
+ Fix gcc 4.1 build
+
+diff --git a/paludis/ipc_output_manager.cc b/paludis/ipc_output_manager.cc
+index 939b979..907cb0e 100644
+--- a/paludis/ipc_output_manager.cc
++++ b/paludis/ipc_output_manager.cc
+@@ -410,8 +410,10 @@ const std::tr1::shared_ptr<OutputManager>
+ OutputManagerFromIPC::operator() (const Action & a)
+ {
+ if (! _imp->result)
+- _imp->result.reset(new IPCOutputManager(_imp->read_fd, _imp->write_fd,
+- CreateOutputManagerForPackageIDActionInfo(_imp->id, a, _imp->exclusivity)));
++ {
++ CreateOutputManagerForPackageIDActionInfo info(_imp->id, a, _imp->exclusivity);
++ _imp->result.reset(new IPCOutputManager(_imp->read_fd, _imp->write_fd, info));
++ }
+ return _imp->result;
+ }
+
diff --git a/sys-apps/paludis/paludis-0.44.0.ebuild b/sys-apps/paludis/paludis-0.44.0.ebuild
index 6b897cb4b574..1087ec2fc744 100644
--- a/sys-apps/paludis/paludis-0.44.0.ebuild
+++ b/sys-apps/paludis/paludis-0.44.0.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/sys-apps/paludis/paludis-0.44.0.ebuild,v 1.1 2010/01/09 16:50:09 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/paludis-0.44.0.ebuild,v 1.2 2010/01/14 22:04:00 peper Exp $
inherit bash-completion eutils flag-o-matic
@@ -64,6 +64,12 @@ pkg_setup() {
create-paludis-user
}
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+ epatch "${FILESDIR}/${P}-gcc41-fix.patch"
+}
+
src_compile() {
local repositories=`echo default unpackaged | tr -s \ ,`
local clients=`echo default accerso adjutrix appareo importare \