summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2008-10-26 03:03:36 +0000
committerMike Frysinger <vapier@gentoo.org>2008-10-26 03:03:36 +0000
commit803830807d96fbe3e961cd74959a2388575c481f (patch)
tree506c46b39e3212947600096d33652c02d9809e77 /sys-fs/device-mapper
parentCheck for /etc/init.d/root rather than /lib/librc.so to avoid multilib issues... (diff)
downloadgentoo-2-803830807d96fbe3e961cd74959a2388575c481f.tar.gz
gentoo-2-803830807d96fbe3e961cd74959a2388575c481f.tar.bz2
gentoo-2-803830807d96fbe3e961cd74959a2388575c481f.zip
Enable pkg-config and tweak how we install into /lib #235256 by Xake.
(Portage version: 2.2_rc12/cvs/Linux 2.6.26.2 x86_64)
Diffstat (limited to 'sys-fs/device-mapper')
-rw-r--r--sys-fs/device-mapper/ChangeLog6
-rw-r--r--sys-fs/device-mapper/device-mapper-1.02.27.ebuild18
2 files changed, 14 insertions, 10 deletions
diff --git a/sys-fs/device-mapper/ChangeLog b/sys-fs/device-mapper/ChangeLog
index 2e610655ace7..0c40d6f98fc2 100644
--- a/sys-fs/device-mapper/ChangeLog
+++ b/sys-fs/device-mapper/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-fs/device-mapper
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/device-mapper/ChangeLog,v 1.120 2008/10/26 02:55:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/device-mapper/ChangeLog,v 1.121 2008/10/26 03:03:36 vapier Exp $
+
+ 26 Oct 2008; Mike Frysinger <vapier@gentoo.org>
+ device-mapper-1.02.27.ebuild:
+ Enable pkg-config and tweak how we install into /lib #235256 by Xake.
26 Oct 2008; Mike Frysinger <vapier@gentoo.org>
files/device-mapper.rc-1.02.22-r3:
diff --git a/sys-fs/device-mapper/device-mapper-1.02.27.ebuild b/sys-fs/device-mapper/device-mapper-1.02.27.ebuild
index b9a0b078e103..eb26f2ff6a74 100644
--- a/sys-fs/device-mapper/device-mapper-1.02.27.ebuild
+++ b/sys-fs/device-mapper/device-mapper-1.02.27.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/device-mapper/device-mapper-1.02.27.ebuild,v 1.1 2008/06/28 09:10:48 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/device-mapper/device-mapper-1.02.27.ebuild,v 1.2 2008/10/26 03:03:36 vapier Exp $
inherit eutils multilib toolchain-funcs
@@ -27,8 +27,10 @@ src_unpack() {
src_compile() {
econf \
+ --libdir=/$(get_libdir) \
--sbindir=/sbin \
--enable-dmeventd \
+ --enable-pkgconfig \
$(use_enable selinux) \
CLDFLAGS="${LDFLAGS}" || die "econf failed"
emake || die "compile problem"
@@ -37,24 +39,22 @@ src_compile() {
src_install() {
emake install DESTDIR="${D}" || die
- # move shared libs to /
- mv "${D}"/usr/$(get_libdir) "${D}"/ || die "move libdir"
- dolib.a lib/ioctl/libdevmapper.a || die "dolib.a"
+ dolib.a lib/ioctl/libdevmapper.a || die
gen_usr_ldscript libdevmapper.so
+ dolib.a dmeventd/libdevmapper-event.a || die
+ gen_usr_ldscript libdevmapper-event.so
insinto /etc
- doins "${FILESDIR}"/dmtab
+ doins "${FILESDIR}"/dmtab || die
insinto /lib/rcscripts/addons
- doins "${FILESDIR}"/dm-start.sh
+ doins "${FILESDIR}"/dm-start.sh || die
newinitd "${FILESDIR}"/device-mapper.rc-1.02.22-r3 device-mapper || die
newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper || die
newinitd "${FILESDIR}"/1.02.22-dmeventd.initd dmeventd || die
- dolib.a dmeventd/libdevmapper-event.a || die
- gen_usr_ldscript libdevmapper-event.so
- insinto /etc/udev/rules.d/
+ insinto /etc/udev/rules.d
newins "${FILESDIR}"/64-device-mapper.rules-1.02.22-r5 64-device-mapper.rules
dodoc INSTALL INTRO README VERSION WHATS_NEW