Fix bug #209705 so that LDFLAGS are respected by the libraries AND binaries.

Package-Manager: portage-2.1.4.1

3 files changed, 83 insertions, 2 deletions

diff --git a/sys-fs/device-mapper/ChangeLog b/sys-fs/device-mapper/ChangeLog
index 51a0620502e0..4b6c36aea391 100644
--- a/sys-fs/device-mapper/ChangeLog
+++ b/sys-fs/device-mapper/ChangeLog
@@ -1,6 +1,12 @@
 # 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.105 2008/02/07 01:54:05 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/device-mapper/ChangeLog,v 1.106 2008/02/11 22:03:52 robbat2 Exp $
+
+*device-mapper-1.02.24-r1 (11 Feb 2008)
+
+  11 Feb 2008; Robin H. Johnson <robbat2@gentoo.org>
+  +device-mapper-1.02.24-r1.ebuild:
+  Fix bug #209705 so that LDFLAGS are respected by the libraries AND binaries.
 
 *device-mapper-1.02.24 (07 Feb 2008)
 
diff --git a/sys-fs/device-mapper/Manifest b/sys-fs/device-mapper/Manifest
index 20f800344537..a0f3d04f8d38 100644
--- a/sys-fs/device-mapper/Manifest
+++ b/sys-fs/device-mapper/Manifest
@@ -20,6 +20,7 @@ EBUILD device-mapper-1.02.22-r3.ebuild 2114 RMD160 05edc7bc37b684d4209003a007dc3
 EBUILD device-mapper-1.02.22-r4.ebuild 2117 RMD160 5f50d27861e038034db772ff7450a10ba5ef5ec1 SHA1 d1f052647bf1a71e0bf94b0e5e9e35f9667e1522 SHA256 b5abf6b8adce7a9a05a7114dd7d65aa69479d065c1d8cdec2e885f8f48ada901
 EBUILD device-mapper-1.02.22-r5.ebuild 2151 RMD160 ba0f248da86ea98e6e4fe82cc69a1eb123574a60 SHA1 2ccfe32d1f01d734e29d6793017388bf0e778b3e SHA256 fcf49d048dd2be54a3819da662916b49feefc485031e79e02d43403494c8f9b2
 EBUILD device-mapper-1.02.22.ebuild 1853 RMD160 a9d4a38a94e59535f65c4925e6296380c9037e77 SHA1 7ebfcbc91a491faefc310d234e49fd1559615c60 SHA256 3b047a69a1c0d04b88531f379505fbbf22ed5b4d23aee57f70245e118a26c715
+EBUILD device-mapper-1.02.24-r1.ebuild 2213 RMD160 51829bf0a4ec97b11fd5942ed32d00408ad03be8 SHA1 ff1f44aa8d0262df5c116338668617944c00479f SHA256 582e30474361b9e94dde00355b862484a2f28bb40ee190eeee21cb677fc360cb
 EBUILD device-mapper-1.02.24.ebuild 2172 RMD160 df8dc287151ac787ce06eafc2e2c7d84e2a52c58 SHA1 e96f91e97990283ab4fad2b9c6afface910ca567 SHA256 f92b915d0a677b7da38c5cf9de141c0254d245de45a4bb4a2967998bf4821cd2
-MISC ChangeLog 18993 RMD160 58cf3335276d7193ff71bce5235444ae7747c028 SHA1 825157d61e21cc428f638b10eb19265649da51c7 SHA256 dbae8587f0d9b2e95118637a65824c4a42b00e67e63321c2ca9b4343f1f8ef12
+MISC ChangeLog 19203 RMD160 434f1d9927e34c8a57c26cdbeb177065fea97426 SHA1 350990b22cc04fd1718e043dfb2940d7df9955d9 SHA256 c23ddeafaa90b45905a97fa3a5642847d1629cc6394ab3d957801bfd6faf7b0e
 MISC metadata.xml 300 RMD160 ede7eb0cde3ab4e83a90578f08e068486a2a59cd SHA1 2f199ce422f4fad87bcbdcb681d8197620bae236 SHA256 4f6e65a7f6e72548a3d0c35a34f7a119dc7f5c13dfc0820939bc8d1b72b75a4d
diff --git a/sys-fs/device-mapper/device-mapper-1.02.24-r1.ebuild b/sys-fs/device-mapper/device-mapper-1.02.24-r1.ebuild
new file mode 100644
index 000000000000..7494c7339266
--- /dev/null
+++ b/sys-fs/device-mapper/device-mapper-1.02.24-r1.ebuild
@@ -0,0 +1,74 @@
+# 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.24-r1.ebuild,v 1.1 2008/02/11 22:03:52 robbat2 Exp $
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="Device mapper ioctl library for use with LVM2 utilities"
+HOMEPAGE="http://sources.redhat.com/dm/"
+SRC_URI="ftp://sources.redhat.com/pub/dm/${PN}.${PV}.tgz
+	ftp://sources.redhat.com/pub/dm/old/${PN}.${PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="selinux"
+
+DEPEND="selinux? ( sys-libs/libselinux )"
+RDEPEND="!<sys-fs/udev-115-r1
+		${DEPEND}"
+
+S="${WORKDIR}/${PN}.${PV}"
+
+src_unpack() {
+	unpack ${A}
+	EPATCH_OPTS="-p1 -d${S}" epatch "${FILESDIR}"/device-mapper-1.02.24-export-format.diff
+}
+
+src_compile() {
+	econf \
+		--sbindir=/sbin \
+		--enable-dmeventd \
+		$(use_enable selinux) \
+		CLDFLAGS="${LDFLAGS}" || die "econf failed"
+	emake || die "compile problem"
+}
+
+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"
+	gen_usr_ldscript libdevmapper.so
+
+	insinto /etc
+	doins "${FILESDIR}"/dmtab
+	insinto /lib/rcscripts/addons
+	doins "${FILESDIR}"/dm-start.sh
+
+	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/
+	newins "${FILESDIR}"/64-device-mapper.rules-1.02.22-r5 64-device-mapper.rules
+
+	dodoc INSTALL INTRO README VERSION WHATS_NEW
+}
+
+pkg_preinst() {
+	local l="${ROOT}"/$(get_libdir)/libdevmapper.so.1.01
+	[[ -e ${l} ]] && cp "${l}" "${D}"/$(get_libdir)/
+}
+
+pkg_postinst() {
+	preserve_old_lib_notify /$(get_libdir)/libdevmapper.so.1.01
+
+	elog "device-mapper volumes are no longer automatically created for"
+	elog "baselayout-2 users. If you are using baselayout-2, be sure to"
+	elog "run: # rc-update add device-mapper boot"
+}