summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2021-06-18 23:41:00 +0100
committerSam James <sam@gentoo.org>2021-06-18 23:49:39 +0100
commitb51eac66d64d0d3aa8e26987b16db70135421a19 (patch)
tree4b204b5083b413a5ae0c08441d5f6ad587537bea /app-emulation/libguestfs
parentnet-libs/libupnp: Stabilize 1.14.7 arm64, #784590 (diff)
downloadgentoo-b51eac66d64d0d3aa8e26987b16db70135421a19.tar.gz
gentoo-b51eac66d64d0d3aa8e26987b16db70135421a19.tar.bz2
gentoo-b51eac66d64d0d3aa8e26987b16db70135421a19.zip
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@korelogic.com> Closes: https://bugs.gentoo.org/789354 Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'app-emulation/libguestfs')
-rw-r--r--app-emulation/libguestfs/libguestfs-1.38.6-r103.ebuild6
-rw-r--r--app-emulation/libguestfs/libguestfs-1.44.1.ebuild4
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 718edf8e60d5..94ccee694c3b 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 d9e4983c5f5a..08c3774a0938 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) \