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 CAA36139083 for ; Thu, 23 Nov 2017 23:02:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0E61EE0E8B; Thu, 23 Nov 2017 23:02:24 +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 E3204E0E8B for ; Thu, 23 Nov 2017 23:02:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 5CB8933BF43 for ; Thu, 23 Nov 2017 23:02:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 01528A545 for ; Thu, 23 Nov 2017 23:02:20 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <1511478133.ca4ccff5a3af1e06f3ff0df2d4ea66f64623811e.robbat2@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.145-r2.ebuild X-VCS-Directories: sys-fs/lvm2/ X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: ca4ccff5a3af1e06f3ff0df2d4ea66f64623811e X-VCS-Branch: master Date: Thu, 23 Nov 2017 23:02:20 +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-Archives-Salt: e9ef81bc-f5d3-4976-a7e9-e78b4b8b6c89 X-Archives-Hash: 0493310f4bc7df1c3df325165908209f commit: ca4ccff5a3af1e06f3ff0df2d4ea66f64623811e Author: Nathan E. Egge dgql org> AuthorDate: Mon Oct 9 09:27:52 2017 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Thu Nov 23 23:02:13 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca4ccff5 sys-fs/lvm2: Fix src_install() error with USE=device-mapper-only Closes: https://github.com/gentoo/gentoo/pull/5899 (cherry picked from commit 7d2702d65cc86575a8c6c4e96a923df3cbccfeae) Signed-off-by: Robin H. Johnson gentoo.org> sys-fs/lvm2/lvm2-2.02.145-r2.ebuild | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sys-fs/lvm2/lvm2-2.02.145-r2.ebuild b/sys-fs/lvm2/lvm2-2.02.145-r2.ebuild index e1def45bbe1..ca67d8edf57 100644 --- a/sys-fs/lvm2/lvm2-2.02.145-r2.ebuild +++ b/sys-fs/lvm2/lvm2-2.02.145-r2.ebuild @@ -256,10 +256,12 @@ 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 + 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 + fi else rm -f "${ED}"usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a fi