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
commitc6550d67df3b8231f5e997fdb81ef603969cb053 (patch)
tree8f7b245b8b89ce069aa623b2c34586a6dde35428 /sys-fs/device-mapper
parentCheck for /etc/init.d/root rather than /lib/librc.so to avoid multilib issues... (diff)
downloadhistorical-c6550d67df3b8231f5e997fdb81ef603969cb053.tar.gz
historical-c6550d67df3b8231f5e997fdb81ef603969cb053.tar.bz2
historical-c6550d67df3b8231f5e997fdb81ef603969cb053.zip
Enable pkg-config and tweak how we install into /lib #235256 by Xake.
Package-Manager: portage-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/Manifest10
-rw-r--r--sys-fs/device-mapper/device-mapper-1.02.27.ebuild18
3 files changed, 19 insertions, 15 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/Manifest b/sys-fs/device-mapper/Manifest
index 4e9363667de5..266b6ab88a97 100644
--- a/sys-fs/device-mapper/Manifest
+++ b/sys-fs/device-mapper/Manifest
@@ -32,13 +32,13 @@ EBUILD device-mapper-1.02.24-r1.ebuild 2200 RMD160 ae639e40cb5ea71afa511302505b3
EBUILD device-mapper-1.02.24.ebuild 2172 RMD160 df8dc287151ac787ce06eafc2e2c7d84e2a52c58 SHA1 e96f91e97990283ab4fad2b9c6afface910ca567 SHA256 f92b915d0a677b7da38c5cf9de141c0254d245de45a4bb4a2967998bf4821cd2
EBUILD device-mapper-1.02.25.ebuild 2209 RMD160 5663bd0d59c1cd96aea4cc687461d6c6f5933391 SHA1 8dd25dc08b1e8308249a21dcedbc79563242c5fd SHA256 6bf4e832edebc55af6e6103395050eb0a306d8c3369e2be07fee3386ce9f2621
EBUILD device-mapper-1.02.26.ebuild 2205 RMD160 186bd93dbe53e943b796f73de4250feb53da9733 SHA1 2a6d05e39b5f797b51ef119cde6737a2f3836bf6 SHA256 cf146a63ccfb403a5cc58e444c1a056c616b1ad1695657f63cdf274065d3eac8
-EBUILD device-mapper-1.02.27.ebuild 2210 RMD160 d8abb3c4bd47c7e7238d5f7bf6777afd9230359d SHA1 be8ad54eec2488c4edb6022414f2d6928267cf55 SHA256 dddeb8fcf45db8fa8ca5d47dbece20e41ef677e85d1b4e81a0459e8261da34ec
-MISC ChangeLog 21104 RMD160 d85becd88e8340152f16c5e242ad6d250c10303d SHA1 1886d499cfff3932834366ed36db49ef9b3e3d0b SHA256 cb3beb62315a3a7f3afbe13ef228c7ff0ccbd6d1f85f0feed6a298e8fd6477d8
+EBUILD device-mapper-1.02.27.ebuild 2180 RMD160 ec212ebf5eb5059d54178aef65f5db3d0d8898eb SHA1 3a832a23d8a48b1a84a41b9eb66bec3064b7aba9 SHA256 5f21cddc16920db505c83cdf3f4a1077cf401ea17d3376ed5d431bc44add0087
+MISC ChangeLog 21259 RMD160 17cec7420976809901a3d1279ccb4ecd720881bd SHA1 5e98db25da97dd69497bd3edefe945f12be9362a SHA256 94534eb2fe1d9e15f5ffbb0863c6bd7588afefc2317531d2369900466d13847b
MISC metadata.xml 300 RMD160 ede7eb0cde3ab4e83a90578f08e068486a2a59cd SHA1 2f199ce422f4fad87bcbdcb681d8197620bae236 SHA256 4f6e65a7f6e72548a3d0c35a34f7a119dc7f5c13dfc0820939bc8d1b72b75a4d
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.9 (GNU/Linux)
-iEYEARECAAYFAkkD3CMACgkQ67wieSYcaxdi1gCgjtVGyq1LBlSzNlbd1euXtJaj
-fWYAnR2xZ2Mt4eYlOBC3OXRBaleeKWCb
-=s6Hf
+iEYEARECAAYFAkkD3g8ACgkQ67wieSYcaxcKbwCg0lacxksAfdPxYsu48UPqdO7I
+1cQAoL6jEqcpyQSf5H4z30paGECn5nSj
+=5q9h
-----END PGP SIGNATURE-----
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