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) \
