summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Zoffoli <xmerlin@gentoo.org>2007-05-26 13:27:34 +0000
committerChristian Zoffoli <xmerlin@gentoo.org>2007-05-26 13:27:34 +0000
commitd7d4f633cb78e9c6838a776118ad0ee4a6b53165 (patch)
treec5c0c5d446cb0f978b2a8d418d08ba09baaa34fb /sys-cluster
parentamd64 stable, bug 176144 (diff)
downloadgentoo-2-d7d4f633cb78e9c6838a776118ad0ee4a6b53165.tar.gz
gentoo-2-d7d4f633cb78e9c6838a776118ad0ee4a6b53165.tar.bz2
gentoo-2-d7d4f633cb78e9c6838a776118ad0ee4a6b53165.zip
Fixed bug #179603.
(Portage version: 2.1.2.2)
Diffstat (limited to 'sys-cluster')
-rw-r--r--sys-cluster/cman/ChangeLog6
-rw-r--r--sys-cluster/cman/cman-1.04.00.ebuild4
-rw-r--r--sys-cluster/cman/files/cman-1.04.00-qdisk-makefile.patch11
3 files changed, 18 insertions, 3 deletions
diff --git a/sys-cluster/cman/ChangeLog b/sys-cluster/cman/ChangeLog
index 6606464197cf..920a776d643a 100644
--- a/sys-cluster/cman/ChangeLog
+++ b/sys-cluster/cman/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-cluster/cman
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cman/ChangeLog,v 1.34 2007/05/12 13:18:52 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cman/ChangeLog,v 1.35 2007/05/26 13:27:34 xmerlin Exp $
+
+ 26 May 2007; Christian Zoffoli <xmerlin@gentoo.org>
+ +files/cman-1.04.00-qdisk-makefile.patch, cman-1.04.00.ebuild:
+ Fixed bug #179603.
12 May 2007; Christian Zoffoli <xmerlin@gentoo.org>
+files/cman-1.03.00-qdisk-makefile.patch, cman-1.03.00.ebuild,
diff --git a/sys-cluster/cman/cman-1.04.00.ebuild b/sys-cluster/cman/cman-1.04.00.ebuild
index 27db3ee34811..6f7628b52980 100644
--- a/sys-cluster/cman/cman-1.04.00.ebuild
+++ b/sys-cluster/cman/cman-1.04.00.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cman/cman-1.04.00.ebuild,v 1.3 2007/05/12 13:18:52 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cman/cman-1.04.00.ebuild,v 1.4 2007/05/26 13:27:34 xmerlin Exp $
inherit eutils
@@ -27,7 +27,7 @@ src_unpack() {
unpack ${A}
cd ${S}
epatch ${FILESDIR}/cman-1.03.00-compile-hack.patch || die
- epatch ${FILESDIR}/${PN}-1.03.00-qdisk-makefile.patch || die
+ epatch ${FILESDIR}/${P}-qdisk-makefile.patch || die
}
diff --git a/sys-cluster/cman/files/cman-1.04.00-qdisk-makefile.patch b/sys-cluster/cman/files/cman-1.04.00-qdisk-makefile.patch
new file mode 100644
index 000000000000..fe5dada4a426
--- /dev/null
+++ b/sys-cluster/cman/files/cman-1.04.00-qdisk-makefile.patch
@@ -0,0 +1,11 @@
+--- cluster-1.04.00/cman/qdisk/Makefile.orig 2007-05-26 15:23:03.000000000 +0200
++++ cluster-1.04.00/cman/qdisk/Makefile 2007-05-26 15:23:23.000000000 +0200
+@@ -42,7 +42,7 @@
+
+ qdiskd: disk.o crc32.o disk_util.o main.o score.o bitmap.o clulog.o \
+ gettid.o proc.o daemon_init.o ../lib/libcman.a
+- gcc -o $@ $^ -lpthread -L../lib -lccs
++ gcc -o $@ $^ -L$(libdir) -lpthread -L../lib -lccs
+
+ mkqdisk: disk.o crc32.o disk_util.o \
+ proc.o mkqdisk.o