summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <eradicator@gentoo.org>2006-06-01 21:24:17 +0000
committerJeremy Huddleston <eradicator@gentoo.org>2006-06-01 21:24:17 +0000
commit0283cea8a40a472eab16c1b5ca188953b7ffdabe (patch)
tree6228fa5e54046f2441d891264bca837d80c251ea /sys-fs/evms
parentInclude patch to make pdns work with openldap-2.3, thanks to Dean Baender in ... (diff)
downloadgentoo-2-0283cea8a40a472eab16c1b5ca188953b7ffdabe.tar.gz
gentoo-2-0283cea8a40a472eab16c1b5ca188953b7ffdabe.tar.bz2
gentoo-2-0283cea8a40a472eab16c1b5ca188953b7ffdabe.zip
Fixed Makefile to work properly with --as-needed. Closes bug #135152. Removing old version.
(Portage version: 2.1_rc3-r3)
Diffstat (limited to 'sys-fs/evms')
-rw-r--r--sys-fs/evms/ChangeLog9
-rw-r--r--sys-fs/evms/evms-2.5.5-r1.ebuild5
-rw-r--r--sys-fs/evms/files/evms-2.5.5-as-needed.patch11
3 files changed, 22 insertions, 3 deletions
diff --git a/sys-fs/evms/ChangeLog b/sys-fs/evms/ChangeLog
index 5ad42212bf9a..7a6d7b87fd7d 100644
--- a/sys-fs/evms/ChangeLog
+++ b/sys-fs/evms/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for sys-fs/evms
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/evms/ChangeLog,v 1.52 2006/05/24 20:52:55 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/evms/ChangeLog,v 1.53 2006/06/01 21:24:17 eradicator Exp $
+
+ 01 Jun 2006; Jeremy Huddleston <eradicator@gentoo.org>
+ -files/2.5.3/md_expand.patch, +files/evms-2.5.5-as-needed.patch,
+ -files/2.5.3/compaq_segments.patch, -evms-2.5.3-r1.ebuild,
+ evms-2.5.5-r1.ebuild:
+ Fixed Makefile to work properly with --as-needed. Closes bug #135152.
+ Removing old version.
24 May 2006; Michael Hanselmann <hansmi@gentoo.org> evms-2.5.5-r1.ebuild:
Stable on ppc.
diff --git a/sys-fs/evms/evms-2.5.5-r1.ebuild b/sys-fs/evms/evms-2.5.5-r1.ebuild
index 4272d8ad02cb..522c2fc3698a 100644
--- a/sys-fs/evms/evms-2.5.5-r1.ebuild
+++ b/sys-fs/evms/evms-2.5.5-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/evms/evms-2.5.5-r1.ebuild,v 1.7 2006/05/24 20:52:55 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/evms/evms-2.5.5-r1.ebuild,v 1.8 2006/06/01 21:24:17 eradicator Exp $
inherit eutils flag-o-matic multilib
@@ -14,7 +14,7 @@ KEYWORDS="amd64 ~ia64 ppc ppc64 sparc x86"
IUSE="ncurses gtk nls"
#EVMS uses libuuid from e2fsprogs
-DEPEND="virtual/libc
+RDEPEND="virtual/libc
sys-fs/e2fsprogs
sys-fs/device-mapper
>=sys-apps/baselayout-1.9.4-r6
@@ -27,6 +27,7 @@ src_unpack() {
cd ${S}
epatch ${FILESDIR}/${PV}/raid5_degrade_fix.patch
epatch ${FILESDIR}/${PV}/md_super_fix.patch
+ epatch ${FILESDIR}/evms-2.5.5-as-needed.patch
}
src_compile() {
diff --git a/sys-fs/evms/files/evms-2.5.5-as-needed.patch b/sys-fs/evms/files/evms-2.5.5-as-needed.patch
new file mode 100644
index 000000000000..0c49b8890ed5
--- /dev/null
+++ b/sys-fs/evms/files/evms-2.5.5-as-needed.patch
@@ -0,0 +1,11 @@
+--- evms-2.5.5/tests/Makefile.in.orig 2006-06-01 15:18:29.508172755 +0200
++++ evms-2.5.5/tests/Makefile.in 2006-06-01 15:18:44.949899142 +0200
+@@ -36,7 +36,7 @@
+ rm -f Makefile
+
+ evms_clean: % : %.o
+- $(CC) -L$(top_srcdir)/engine $(EVMS_LDFLAGS) $(EVMS_LIBS) $(PTHREAD_LIBS) $(EFENCE_LIBS) -levms -o $@ $@.o
++ $(CC) -L$(top_srcdir)/engine $(EVMS_LDFLAGS) $@.o $(EVMS_LIBS) $(PTHREAD_LIBS) $(EFENCE_LIBS) -levms -o $@
+
+ evms_deactivate seq_dd lvm2_crc: % : %.o
+ $(CC) -o $@ $@.o