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

Package-Manager: portage-2.1.4.1

3 files changed, 150 insertions, 12 deletions

diff --git a/sys-fs/lvm2/ChangeLog b/sys-fs/lvm2/ChangeLog
index 3e6c6661e218..9ad2bd999f71 100644
--- a/sys-fs/lvm2/ChangeLog
+++ b/sys-fs/lvm2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/lvm2
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.130 2008/02/08 20:37:34 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.131 2008/02/11 22:10:00 robbat2 Exp $
+
+*lvm2-2.02.33-r1 (11 Feb 2008)
+
+  11 Feb 2008; Robin H. Johnson <robbat2@gentoo.org>
+  +lvm2-2.02.33-r1.ebuild:
+  Fix bug #209742 so that LDFLAGS are respected by the libraries AND binaries.
 
   08 Feb 2008; Doug Klima <cardoe@gentoo.org> lvm2-2.02.33.ebuild:
   depend on newer device-mapper for DM_READ_AHEAD_AUTO define. bug #209381
diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
index fb8a3c968031..6de1c3fc801d 100644
--- a/sys-fs/lvm2/Manifest
+++ b/sys-fs/lvm2/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX clvmd.rc 3667 RMD160 65d5037bc251db5fd84a07aa5ce75512b55a61ea SHA1 4eb1b4e79c9690bb5d7b0bf4466f9cb9acca5026 SHA256 8770fbafcc061ceda9add71795a5c81b28c1be4a10c8e8a722b33f9bdd12c0c1
 AUX clvmd.rc-2.02.28-r3 3367 RMD160 eb09f9ef6d9402c9a22ab145ebb64db5f279adc7 SHA1 f15770f0919402f2fbbc7d8441ef3239e6178d0b SHA256 14c1c738b26869877a2bc74f0f8dd0ae4a764976823443db6f5575556285b519
 AUX lvm.conf-2.02.28-r3.patch 2719 RMD160 6c1bfee374b2a58b3229984646b21443a9b34ad2 SHA1 6c6c524b3ec2e7a1b43dee19ff4c71495bae88fc SHA256 9304c543aca526b43a2b5b681ca3f50acc91db8b7f019f0e426e7ac5874a0c55
@@ -24,13 +21,7 @@ EBUILD lvm2-2.02.28-r3.ebuild 4427 RMD160 6828d9432b60d15e40df1ca4e8ff45294ceb54
 EBUILD lvm2-2.02.28-r4.ebuild 4358 RMD160 aa41f57955ef3bddc46fb3d791c1caa8685b6251 SHA1 1cd394ea0a58d68ca76c6b9bca4ff246bcfa9e4f SHA256 516ab0aa4f72e77980b95db78599ef460d42f6a4965854ab80684347a6a63f82
 EBUILD lvm2-2.02.28-r5.ebuild 4368 RMD160 6bce4fc20209889f1ad33f2b56dbb3d8d5a63da3 SHA1 b3d9c4b4cc0fcb5ba27cdeb9b24f4d67b31f2d68 SHA256 f672c2cd8711124f23ce99cb059e4d9e05559950631da7f23eea24eb02a85666
 EBUILD lvm2-2.02.28.ebuild 3370 RMD160 4f446bef10ca71ab2fc62b260ff5c07a751dbb60 SHA1 674fe51da0d20c3f0a0a0b074c35018f46a26341 SHA256 7798af898a4b64304e0bd8b69b1a5c81f9f89f5ef5a063c654c42ed1276178e5
+EBUILD lvm2-2.02.33-r1.ebuild 4389 RMD160 1ee21cb153bad794bd5a5e62b48efc41a9479d96 SHA1 69ffad06b782cc6505100aa8214ccbe814491e21 SHA256 b4eb26d41568796e6c310f6d02fc72eee02c7e3805978949d17910ee4fdfca3e
 EBUILD lvm2-2.02.33.ebuild 4359 RMD160 1ec5ad194cb05bcbd731acb7eccfd7ed002efbf9 SHA1 84c91bf49edecf0985267e06feb4d7a39389e1e8 SHA256 fc5f65e99ad43eb04ccf4d93da0d6137c5b6e23263f88ddf8f9c2def2d014aff
-MISC ChangeLog 20244 RMD160 f8c587db220417e7930765e7f5977400ffe452a9 SHA1 e81ed3c0820db879ffd11f7f2e66466fa550de6e SHA256 1aa1ca82e41e3e985d7e3f32bc5a3ee2de1d574ba4217f1f3b767732d40d5317
+MISC ChangeLog 20437 RMD160 775b378b02073d7d64ffc32752b84dc74bb7fdaf SHA1 8a6ee165517b81c3ce5dacb3fecfd0ca76f1c97e SHA256 34bd66ae3b7fa56ec5904498b8332d4aeb2b314929af9f701c60582106979385
 MISC metadata.xml 703 RMD160 b717628fbf06a8cbe39fb1d5bf680594a7dfaef6 SHA1 2e1f89a04aa9b40c8c7152217c953f827b5e8c5e SHA256 74147c334ed7c4596991af8dcaa2c08196a6dfd5a522d18d0a5d09da51290d65
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFHrL3goeSe8B0zEfwRAnYXAJ4mhpnIlwTfx/HQEg5Km3Z6bUDEDgCcC2ym
-i9MaHmPikxVWq2b4u1y0jko=
-=iR2F
------END PGP SIGNATURE-----
diff --git a/sys-fs/lvm2/lvm2-2.02.33-r1.ebuild b/sys-fs/lvm2/lvm2-2.02.33-r1.ebuild
new file mode 100644
index 000000000000..9607744d35cc
--- /dev/null
+++ b/sys-fs/lvm2/lvm2-2.02.33-r1.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.33-r1.ebuild,v 1.1 2008/02/11 22:10:00 robbat2 Exp $
+
+inherit eutils multilib
+
+DESCRIPTION="User-land utilities for LVM2 (device-mapper) software."
+HOMEPAGE="http://sources.redhat.com/lvm2/"
+SRC_URI="ftp://sources.redhat.com/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="readline static clvm cman gulm lvm1 selinux"
+
+DEPEND=">=sys-fs/device-mapper-1.02.24
+		clvm? ( >=sys-cluster/dlm-1.01.00
+			cman? ( >=sys-cluster/cman-1.01.00 )
+			gulm? ( >=sys-cluster/gulm-1.00.00 ) )"
+
+RDEPEND="${DEPEND}
+	!sys-fs/lvm-user
+	!sys-fs/clvm"
+
+S="${WORKDIR}/${PN/lvm/LVM}.${PV}"
+
+pkg_setup() {
+	use nolvmstatic && eerror "USE=nolvmstatic has changed to USE=static via package.use"
+	use nolvm1 && eerror "USE=nolvm1 has changed to USE=lvm1 via package.use"
+}
+
+src_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}"/lvm.conf-2.02.33.patch
+}
+
+src_compile() {
+	# Static compile of lvm2 so that the install described in the handbook works
+	# http://www.gentoo.org/doc/en/lvm2.xml
+	# fixes http://bugs.gentoo.org/show_bug.cgi?id=84463
+	local myconf
+	local buildmode
+
+	# fsadm is broken, don't include it (2.02.28)
+	myconf="${myconf} --enable-dmeventd --enable-cmdlib"
+
+	# Most of this package does weird stuff.
+	# The build options are tristate, and --without is NOT supported
+	# options: 'none', 'internal', 'shared'
+	if use static ; then
+		einfo "Building static LVM, for usage inside genkernel"
+		myconf="${myconf} --enable-static_link"
+		buildmode="internal"
+	else
+		ewarn "Building shared LVM, it will not work inside genkernel!"
+		buildmode="shared"
+	fi
+
+	# dmeventd requires mirrors to be internal, and snapshot available
+	# so we cannot disable them
+	myconf="${myconf} --with-mirrors=internal"
+	myconf="${myconf} --with-snapshots=internal"
+
+	if use lvm1 ; then
+		myconf="${myconf} --with-lvm1=${buildmode}"
+	else
+		myconf="${myconf} --with-lvm1=none"
+	fi
+
+	# disable O_DIRECT support on hppa, breaks pv detection (#99532)
+	use hppa && myconf="${myconf} --disable-o_direct"
+
+	if use clvm; then
+		myconf="${myconf} --with-cluster=${buildmode}"
+		# 4-state!
+		local clvmd="none"
+		use cman && clvmd="cman"
+		use gulm && clvmd="${clvmd}gulm"
+		clvmd="${clvmd/cmangulm/all}"
+		myconf="${myconf} --with-clvmd=${clvmd}"
+		myconf="${myconf} --with-pool=${buildmode}"
+	else
+		myconf="${myconf} --with-clvmd=none --with-cluster=none"
+	fi
+
+	myconf="${myconf} --sbindir=/sbin --with-staticdir=/sbin"
+	econf $(use_enable readline) \
+		$(use_enable selinux) \
+		--libdir=/usr/$(get_libdir) \
+		${myconf} \
+		CLDFLAGS="${LDFLAGS}" || die
+	emake || die "compile problem"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	# TODO: At some point in the future, we need to stop installing the static
+	# as the /sbin/lvm name, and have both variants seperate.
+	if use static; then
+		cp -f "${D}"/sbin/lvm.static "${D}"/sbin/lvm \
+			|| die "Failed to copy lvm.static"
+	fi
+
+	dodir /$(get_libdir)
+	# Put these in root so we can reach before /usr is up
+	for i in libdevmapper-event-lvm2mirror liblvm2{format1,snapshot} ; do
+		b="${D}"/usr/$(get_libdir)/${i}
+		if [ -f "${b}".so ]; then
+			mv -f "${b}".so* "${D}"/$(get_libdir) || die
+		fi
+	done
+
+	dodoc README VERSION WHATS_NEW doc/*.{conf,c,txt}
+	insinto /lib/rcscripts/addons
+	newins "${FILESDIR}"/lvm2-start.sh-2.02.28-r2 lvm-start.sh || die
+	newins "${FILESDIR}"/lvm2-stop.sh-2.02.28-r5 lvm-stop.sh || die
+	newinitd "${FILESDIR}"/lvm.rc-2.02.28-r2 lvm || die
+	newconfd "${FILESDIR}"/lvm.confd-2.02.28-r2 lvm || die
+	if use clvm; then
+		newinitd "${FILESDIR}"/clvmd.rc-2.02.28-r3 clvmd || die
+	fi
+
+	elog "use flag nocman is deprecated and replaced"
+	elog "with cman and gulm use flags."
+	elog ""
+	elog "use flags clvm,cman and gulm are masked"
+	elog "by default and need to be unmasked to use them"
+	elog ""
+	elog "Rebuild your genkernel initramfs if you are using lvm"
+	use nolvmstatic && \
+		elog "USE=nolvmstatic has changed to USE=static via package.use"
+	use nolvm1 && \
+		elog "USE=nolvm1 has changed to USE=lvm1 via package.use"
+}
+
+pkg_postinst() {
+	elog "lvm 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 lvm boot"
+}