summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKacper Kowalik <xarthisius@gentoo.org>2012-05-16 10:44:42 +0000
committerKacper Kowalik <xarthisius@gentoo.org>2012-05-16 10:44:42 +0000
commit6cb5defd33ae656666e68c7bfc29a3ff196665ca (patch)
treee2ab8cf9870d4f243c9a7efeeecaca05fc0901e8 /sys-cluster/pacemaker
parentold (diff)
downloadgentoo-2-6cb5defd33ae656666e68c7bfc29a3ff196665ca.tar.gz
gentoo-2-6cb5defd33ae656666e68c7bfc29a3ff196665ca.tar.bz2
gentoo-2-6cb5defd33ae656666e68c7bfc29a3ff196665ca.zip
Fix building with glib-2.32, thanks to Marc Schiffbauer <mschiff@gentoo.org> for patch
(Portage version: 2.2.0_alpha105/cvs/Linux x86_64)
Diffstat (limited to 'sys-cluster/pacemaker')
-rw-r--r--sys-cluster/pacemaker/ChangeLog8
-rw-r--r--sys-cluster/pacemaker/pacemaker-1.1.6.1.ebuild6
2 files changed, 10 insertions, 4 deletions
diff --git a/sys-cluster/pacemaker/ChangeLog b/sys-cluster/pacemaker/ChangeLog
index f9be19336bbc..c1d2fba97303 100644
--- a/sys-cluster/pacemaker/ChangeLog
+++ b/sys-cluster/pacemaker/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-cluster/pacemaker
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/ChangeLog,v 1.17 2011/10/24 11:25:48 ultrabug Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/ChangeLog,v 1.18 2012/05/16 10:44:42 xarthisius Exp $
+
+ 16 May 2012; Kacper Kowalik <xarthisius@gentoo.org> pacemaker-1.1.6.1.ebuild:
+ Fix building with glib-2.32, thanks to Marc Schiffbauer <mschiff@gentoo.org>
+ for patch
24 Oct 2011; Ultrabug <ultrabug@gentoo.org> +pacemaker-1.1.6.1.ebuild,
metadata.xml:
diff --git a/sys-cluster/pacemaker/pacemaker-1.1.6.1.ebuild b/sys-cluster/pacemaker/pacemaker-1.1.6.1.ebuild
index f89b6ad0b471..a1ca98d13535 100644
--- a/sys-cluster/pacemaker/pacemaker-1.1.6.1.ebuild
+++ b/sys-cluster/pacemaker/pacemaker-1.1.6.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/pacemaker-1.1.6.1.ebuild,v 1.1 2011/10/24 11:25:48 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/pacemaker-1.1.6.1.ebuild,v 1.2 2012/05/16 10:44:42 xarthisius Exp $
EAPI=4
@@ -44,6 +44,8 @@ pkg_setup() {
src_prepare() {
base_src_prepare
sed -i -e "/ggdb3/d" configure.ac || die
+ sed -e "s:<glib/ghash.h>:<glib.h>:" \
+ -i lib/ais/plugin.c || die
eautoreconf
}