Gentoo Archives: gentoo-commits

From: "Robin H. Johnson" <robbat2@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/lvm2/
Date: Thu, 23 Nov 2017 23:02:24
Message-Id: 1511478133.ca4ccff5a3af1e06f3ff0df2d4ea66f64623811e.robbat2@gentoo
1 commit: ca4ccff5a3af1e06f3ff0df2d4ea66f64623811e
2 Author: Nathan E. Egge <negge <AT> dgql <DOT> org>
3 AuthorDate: Mon Oct 9 09:27:52 2017 +0000
4 Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
5 CommitDate: Thu Nov 23 23:02:13 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca4ccff5
7
8 sys-fs/lvm2: Fix src_install() error with USE=device-mapper-only
9
10 Closes: https://github.com/gentoo/gentoo/pull/5899
11 (cherry picked from commit 7d2702d65cc86575a8c6c4e96a923df3cbccfeae)
12 Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
13
14 sys-fs/lvm2/lvm2-2.02.145-r2.ebuild | 10 ++++++----
15 1 file changed, 6 insertions(+), 4 deletions(-)
16
17 diff --git a/sys-fs/lvm2/lvm2-2.02.145-r2.ebuild b/sys-fs/lvm2/lvm2-2.02.145-r2.ebuild
18 index e1def45bbe1..ca67d8edf57 100644
19 --- a/sys-fs/lvm2/lvm2-2.02.145-r2.ebuild
20 +++ b/sys-fs/lvm2/lvm2-2.02.145-r2.ebuild
21 @@ -256,10 +256,12 @@ src_install() {
22
23 if use static-libs; then
24 dolib.a libdm/ioctl/libdevmapper.a
25 - dolib.a libdaemon/client/libdaemonclient.a #462908
26 - #gen_usr_ldscript libdevmapper.so
27 - dolib.a daemons/dmeventd/libdevmapper-event.a
28 - #gen_usr_ldscript libdevmapper-event.so
29 + if use !device-mapper-only ; then
30 + dolib.a libdaemon/client/libdaemonclient.a #462908
31 + #gen_usr_ldscript libdevmapper.so
32 + dolib.a daemons/dmeventd/libdevmapper-event.a
33 + #gen_usr_ldscript libdevmapper-event.so
34 + fi
35 else
36 rm -f "${ED}"usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a
37 fi