From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 99947138334 for ; Fri, 6 Sep 2019 19:44:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 32C01E09FE; Fri, 6 Sep 2019 19:44:20 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B8EACE09FE for ; Fri, 6 Sep 2019 19:44:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 88A2134ADA2 for ; Fri, 6 Sep 2019 19:44:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 40B02780 for ; Fri, 6 Sep 2019 19:44:15 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1567799042.626209719cd599c6d24cf21b80175e6dd78f1d10.whissi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/lvm2/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-fs/lvm2/lvm2-2.02.185.ebuild sys-fs/lvm2/lvm2-2.02.186.ebuild sys-fs/lvm2/lvm2-2.03.05.ebuild X-VCS-Directories: sys-fs/lvm2/ X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: 626209719cd599c6d24cf21b80175e6dd78f1d10 X-VCS-Branch: master Date: Fri, 6 Sep 2019 19:44:15 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 5eac9bc0-54e2-469b-80cb-e06a9620e9e9 X-Archives-Hash: c3d97e37839898b4fb12da4c4018e352 commit: 626209719cd599c6d24cf21b80175e6dd78f1d10 Author: Thomas Deutschmann gentoo org> AuthorDate: Fri Sep 6 19:21:44 2019 +0000 Commit: Thomas Deutschmann gentoo 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 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