| 1 |
commit: 626209719cd599c6d24cf21b80175e6dd78f1d10 |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Sep 6 19:21:44 2019 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Sep 6 19:44:02 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62620971 |
| 7 |
|
| 8 |
sys-fs/lvm2: fix USE="static-libs device-mapper-only" |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/686146 |
| 11 |
Package-Manager: Portage-2.3.75, Repoman-2.3.17 |
| 12 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
| 13 |
|
| 14 |
sys-fs/lvm2/lvm2-2.02.185.ebuild | 10 +++++++--- |
| 15 |
sys-fs/lvm2/lvm2-2.02.186.ebuild | 10 +++++++--- |
| 16 |
sys-fs/lvm2/lvm2-2.03.05.ebuild | 10 +++++++--- |
| 17 |
3 files changed, 21 insertions(+), 9 deletions(-) |
| 18 |
|
| 19 |
diff --git a/sys-fs/lvm2/lvm2-2.02.185.ebuild b/sys-fs/lvm2/lvm2-2.02.185.ebuild |
| 20 |
index 812f84d2b65..459f918637b 100644 |
| 21 |
--- a/sys-fs/lvm2/lvm2-2.02.185.ebuild |
| 22 |
+++ b/sys-fs/lvm2/lvm2-2.02.185.ebuild |
| 23 |
@@ -242,10 +242,14 @@ src_install() { |
| 24 |
|
| 25 |
if use static-libs; then |
| 26 |
dolib.a libdm/ioctl/libdevmapper.a |
| 27 |
- dolib.a libdaemon/client/libdaemonclient.a #462908 |
| 28 |
#gen_usr_ldscript libdevmapper.so |
| 29 |
- dolib.a daemons/dmeventd/libdevmapper-event.a |
| 30 |
- #gen_usr_ldscript libdevmapper-event.so |
| 31 |
+ if use !device-mapper-only; then |
| 32 |
+ # depends on lvmetad |
| 33 |
+ dolib.a libdaemon/client/libdaemonclient.a #462908 |
| 34 |
+ # depends on dmeventd |
| 35 |
+ dolib.a daemons/dmeventd/libdevmapper-event.a |
| 36 |
+ #gen_usr_ldscript libdevmapper-event.so |
| 37 |
+ fi |
| 38 |
else |
| 39 |
rm -f "${ED}"/usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a |
| 40 |
fi |
| 41 |
|
| 42 |
diff --git a/sys-fs/lvm2/lvm2-2.02.186.ebuild b/sys-fs/lvm2/lvm2-2.02.186.ebuild |
| 43 |
index 812f84d2b65..459f918637b 100644 |
| 44 |
--- a/sys-fs/lvm2/lvm2-2.02.186.ebuild |
| 45 |
+++ b/sys-fs/lvm2/lvm2-2.02.186.ebuild |
| 46 |
@@ -242,10 +242,14 @@ src_install() { |
| 47 |
|
| 48 |
if use static-libs; then |
| 49 |
dolib.a libdm/ioctl/libdevmapper.a |
| 50 |
- dolib.a libdaemon/client/libdaemonclient.a #462908 |
| 51 |
#gen_usr_ldscript libdevmapper.so |
| 52 |
- dolib.a daemons/dmeventd/libdevmapper-event.a |
| 53 |
- #gen_usr_ldscript libdevmapper-event.so |
| 54 |
+ if use !device-mapper-only; then |
| 55 |
+ # depends on lvmetad |
| 56 |
+ dolib.a libdaemon/client/libdaemonclient.a #462908 |
| 57 |
+ # depends on dmeventd |
| 58 |
+ dolib.a daemons/dmeventd/libdevmapper-event.a |
| 59 |
+ #gen_usr_ldscript libdevmapper-event.so |
| 60 |
+ fi |
| 61 |
else |
| 62 |
rm -f "${ED}"/usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a |
| 63 |
fi |
| 64 |
|
| 65 |
diff --git a/sys-fs/lvm2/lvm2-2.03.05.ebuild b/sys-fs/lvm2/lvm2-2.03.05.ebuild |
| 66 |
index 12b13a5e36e..87f738bf20e 100644 |
| 67 |
--- a/sys-fs/lvm2/lvm2-2.03.05.ebuild |
| 68 |
+++ b/sys-fs/lvm2/lvm2-2.03.05.ebuild |
| 69 |
@@ -230,10 +230,14 @@ src_install() { |
| 70 |
|
| 71 |
if use static-libs; then |
| 72 |
dolib.a libdm/ioctl/libdevmapper.a |
| 73 |
- dolib.a libdaemon/client/libdaemonclient.a #462908 |
| 74 |
#gen_usr_ldscript libdevmapper.so |
| 75 |
- dolib.a daemons/dmeventd/libdevmapper-event.a |
| 76 |
- #gen_usr_ldscript libdevmapper-event.so |
| 77 |
+ if use !device-mapper-only; then |
| 78 |
+ # depends on lvmetad |
| 79 |
+ dolib.a libdaemon/client/libdaemonclient.a #462908 |
| 80 |
+ # depends on dmeventd |
| 81 |
+ dolib.a daemons/dmeventd/libdevmapper-event.a |
| 82 |
+ #gen_usr_ldscript libdevmapper-event.so |
| 83 |
+ fi |
| 84 |
else |
| 85 |
rm -f "${ED}"/usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a |
| 86 |
fi |
Archives