commit: 626209719cd599c6d24cf21b80175e6dd78f1d10 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> AuthorDate: Fri Sep 6 19:21:44 2019 +0000 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> CommitDate: Fri Sep 6 19:44:02 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62620971
sys-fs/lvm2: fix USE="static-libs device-mapper-only" Closes: https://bugs.gentoo.org/686146 Package-Manager: Portage-2.3.75, Repoman-2.3.17 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> sys-fs/lvm2/lvm2-2.02.185.ebuild | 10 +++++++--- sys-fs/lvm2/lvm2-2.02.186.ebuild | 10 +++++++--- sys-fs/lvm2/lvm2-2.03.05.ebuild | 10 +++++++--- 3 files changed, 21 insertions(+), 9 deletions(-) diff --git a/sys-fs/lvm2/lvm2-2.02.185.ebuild b/sys-fs/lvm2/lvm2-2.02.185.ebuild index 812f84d2b65..459f918637b 100644 --- a/sys-fs/lvm2/lvm2-2.02.185.ebuild +++ b/sys-fs/lvm2/lvm2-2.02.185.ebuild @@ -242,10 +242,14 @@ src_install() { if use static-libs; then dolib.a libdm/ioctl/libdevmapper.a - dolib.a libdaemon/client/libdaemonclient.a #462908 #gen_usr_ldscript libdevmapper.so - dolib.a daemons/dmeventd/libdevmapper-event.a - #gen_usr_ldscript libdevmapper-event.so + if use !device-mapper-only; then + # depends on lvmetad + dolib.a libdaemon/client/libdaemonclient.a #462908 + # depends on dmeventd + dolib.a daemons/dmeventd/libdevmapper-event.a + #gen_usr_ldscript libdevmapper-event.so + fi else rm -f "${ED}"/usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a fi diff --git a/sys-fs/lvm2/lvm2-2.02.186.ebuild b/sys-fs/lvm2/lvm2-2.02.186.ebuild index 812f84d2b65..459f918637b 100644 --- a/sys-fs/lvm2/lvm2-2.02.186.ebuild +++ b/sys-fs/lvm2/lvm2-2.02.186.ebuild @@ -242,10 +242,14 @@ src_install() { if use static-libs; then dolib.a libdm/ioctl/libdevmapper.a - dolib.a libdaemon/client/libdaemonclient.a #462908 #gen_usr_ldscript libdevmapper.so - dolib.a daemons/dmeventd/libdevmapper-event.a - #gen_usr_ldscript libdevmapper-event.so + if use !device-mapper-only; then + # depends on lvmetad + dolib.a libdaemon/client/libdaemonclient.a #462908 + # depends on dmeventd + dolib.a daemons/dmeventd/libdevmapper-event.a + #gen_usr_ldscript libdevmapper-event.so + fi else rm -f "${ED}"/usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a fi diff --git a/sys-fs/lvm2/lvm2-2.03.05.ebuild b/sys-fs/lvm2/lvm2-2.03.05.ebuild index 12b13a5e36e..87f738bf20e 100644 --- a/sys-fs/lvm2/lvm2-2.03.05.ebuild +++ b/sys-fs/lvm2/lvm2-2.03.05.ebuild @@ -230,10 +230,14 @@ src_install() { if use static-libs; then dolib.a libdm/ioctl/libdevmapper.a - dolib.a libdaemon/client/libdaemonclient.a #462908 #gen_usr_ldscript libdevmapper.so - dolib.a daemons/dmeventd/libdevmapper-event.a - #gen_usr_ldscript libdevmapper-event.so + if use !device-mapper-only; then + # depends on lvmetad + dolib.a libdaemon/client/libdaemonclient.a #462908 + # depends on dmeventd + dolib.a daemons/dmeventd/libdevmapper-event.a + #gen_usr_ldscript libdevmapper-event.so + fi else rm -f "${ED}"/usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a fi
