From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1294974-garchives=archives.gentoo.org@lists.gentoo.org>
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 7367213835A
for <garchives@archives.gentoo.org>; Fri, 18 Jun 2021 22:51:06 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 8C6C0E086A;
Fri, 18 Jun 2021 22:51:05 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(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 71BBEE086A
for <gentoo-commits@lists.gentoo.org>; Fri, 18 Jun 2021 22:51:05 +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 48833340B53
for <gentoo-commits@lists.gentoo.org>; Fri, 18 Jun 2021 22:51:03 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 91B757A1
for <gentoo-commits@lists.gentoo.org>; Fri, 18 Jun 2021 22:51:01 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1624056579.b51eac66d64d0d3aa8e26987b16db70135421a19.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/libguestfs/
X-VCS-Repository: repo/gentoo
X-VCS-Files: app-emulation/libguestfs/libguestfs-1.38.6-r103.ebuild app-emulation/libguestfs/libguestfs-1.44.1.ebuild
X-VCS-Directories: app-emulation/libguestfs/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: b51eac66d64d0d3aa8e26987b16db70135421a19
X-VCS-Branch: master
Date: Fri, 18 Jun 2021 22:51:01 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 536789ba-0c80-423d-9a89-c35886d3add8
X-Archives-Hash: 3e25ed9285755a25acf97d3495b5c472
commit: b51eac66d64d0d3aa8e26987b16db70135421a19
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 18 22:41:00 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jun 18 22:49:39 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b51eac66
app-emulation/libguestfs: fix libxcrypt RPATH
We were struggling to find libxcrypt (when USE=-system) because it's buried
away in a subdir - /usr/$(get_libdir)/xcrypt.
For now, let's include a helping hand hint (RPATH) to tell binaries to look
there for libraries. This won't be an issue in future when we fully remove/disable
libcrypt from glibc and use libxcrypt[system] instead.
Thanks-to: Hank Leininger <hlein <AT> korelogic.com>
Closes: https://bugs.gentoo.org/789354
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-emulation/libguestfs/libguestfs-1.38.6-r103.ebuild | 6 ++++--
app-emulation/libguestfs/libguestfs-1.44.1.ebuild | 4 +++-
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/app-emulation/libguestfs/libguestfs-1.38.6-r103.ebuild b/app-emulation/libguestfs/libguestfs-1.38.6-r103.ebuild
index 718edf8e60d..94ccee694c3 100644
--- a/app-emulation/libguestfs/libguestfs-1.38.6-r103.ebuild
+++ b/app-emulation/libguestfs/libguestfs-1.38.6-r103.ebuild
@@ -138,8 +138,10 @@ src_configure() {
# configured kernel.
export vmchannel_test=no
- # bug #703118
- append-ldflags "-L/usr/$(get_libdir)/xcrypt"
+ # Give a nudge to help find libxcrypt[-system]
+ # bug #703118, bug #789354
+ append-ldflags "-L${ESYSROOT}/usr/$(get_libdir)/xcrypt"
+ append-ldflags "-Wl,-R${ESYSROOT}/usr/$(get_libdir)/xcrypt"
econf \
--with-bashcompletiondir="$(get_bashcompdir)" \
diff --git a/app-emulation/libguestfs/libguestfs-1.44.1.ebuild b/app-emulation/libguestfs/libguestfs-1.44.1.ebuild
index d9e4983c5f5..08c3774a093 100644
--- a/app-emulation/libguestfs/libguestfs-1.44.1.ebuild
+++ b/app-emulation/libguestfs/libguestfs-1.44.1.ebuild
@@ -152,8 +152,10 @@ src_configure() {
# configured kernel.
export vmchannel_test=no
- # bug #703118
+ # Give a nudge to help find libxcrypt[-system]
+ # bug #703118, bug #789354
append-ldflags "-L${ESYSROOT}/usr/$(get_libdir)/xcrypt"
+ append-ldflags "-Wl,-R${ESYSROOT}/usr/$(get_libdir)/xcrypt"
econf \
$(use_with libvirt) \