| 1 |
commit: b51eac66d64d0d3aa8e26987b16db70135421a19 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jun 18 22:41:00 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jun 18 22:49:39 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b51eac66 |
| 7 |
|
| 8 |
app-emulation/libguestfs: fix libxcrypt RPATH |
| 9 |
|
| 10 |
We were struggling to find libxcrypt (when USE=-system) because it's buried |
| 11 |
away in a subdir - /usr/$(get_libdir)/xcrypt. |
| 12 |
|
| 13 |
For now, let's include a helping hand hint (RPATH) to tell binaries to look |
| 14 |
there for libraries. This won't be an issue in future when we fully remove/disable |
| 15 |
libcrypt from glibc and use libxcrypt[system] instead. |
| 16 |
|
| 17 |
Thanks-to: Hank Leininger <hlein <AT> korelogic.com> |
| 18 |
Closes: https://bugs.gentoo.org/789354 |
| 19 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 20 |
|
| 21 |
app-emulation/libguestfs/libguestfs-1.38.6-r103.ebuild | 6 ++++-- |
| 22 |
app-emulation/libguestfs/libguestfs-1.44.1.ebuild | 4 +++- |
| 23 |
2 files changed, 7 insertions(+), 3 deletions(-) |
| 24 |
|
| 25 |
diff --git a/app-emulation/libguestfs/libguestfs-1.38.6-r103.ebuild b/app-emulation/libguestfs/libguestfs-1.38.6-r103.ebuild |
| 26 |
index 718edf8e60d..94ccee694c3 100644 |
| 27 |
--- a/app-emulation/libguestfs/libguestfs-1.38.6-r103.ebuild |
| 28 |
+++ b/app-emulation/libguestfs/libguestfs-1.38.6-r103.ebuild |
| 29 |
@@ -138,8 +138,10 @@ src_configure() { |
| 30 |
# configured kernel. |
| 31 |
export vmchannel_test=no |
| 32 |
|
| 33 |
- # bug #703118 |
| 34 |
- append-ldflags "-L/usr/$(get_libdir)/xcrypt" |
| 35 |
+ # Give a nudge to help find libxcrypt[-system] |
| 36 |
+ # bug #703118, bug #789354 |
| 37 |
+ append-ldflags "-L${ESYSROOT}/usr/$(get_libdir)/xcrypt" |
| 38 |
+ append-ldflags "-Wl,-R${ESYSROOT}/usr/$(get_libdir)/xcrypt" |
| 39 |
|
| 40 |
econf \ |
| 41 |
--with-bashcompletiondir="$(get_bashcompdir)" \ |
| 42 |
|
| 43 |
diff --git a/app-emulation/libguestfs/libguestfs-1.44.1.ebuild b/app-emulation/libguestfs/libguestfs-1.44.1.ebuild |
| 44 |
index d9e4983c5f5..08c3774a093 100644 |
| 45 |
--- a/app-emulation/libguestfs/libguestfs-1.44.1.ebuild |
| 46 |
+++ b/app-emulation/libguestfs/libguestfs-1.44.1.ebuild |
| 47 |
@@ -152,8 +152,10 @@ src_configure() { |
| 48 |
# configured kernel. |
| 49 |
export vmchannel_test=no |
| 50 |
|
| 51 |
- # bug #703118 |
| 52 |
+ # Give a nudge to help find libxcrypt[-system] |
| 53 |
+ # bug #703118, bug #789354 |
| 54 |
append-ldflags "-L${ESYSROOT}/usr/$(get_libdir)/xcrypt" |
| 55 |
+ append-ldflags "-Wl,-R${ESYSROOT}/usr/$(get_libdir)/xcrypt" |
| 56 |
|
| 57 |
econf \ |
| 58 |
$(use_with libvirt) \ |
Archives