| 1 |
commit: d04534bfb44f8f1cad29c6c54ec6cdbbecede36f |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jul 16 03:56:37 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jul 16 03:56:37 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d04534bf |
| 7 |
|
| 8 |
sys-libs/libxcrypt: fix installation on prefix in 4.4.23-r1 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/802222 |
| 11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 12 |
|
| 13 |
sys-libs/libxcrypt/libxcrypt-4.4.23-r1.ebuild | 12 ++++++------ |
| 14 |
1 file changed, 6 insertions(+), 6 deletions(-) |
| 15 |
|
| 16 |
diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.23-r1.ebuild b/sys-libs/libxcrypt/libxcrypt-4.4.23-r1.ebuild |
| 17 |
index d03062b4d64..59a192d732e 100644 |
| 18 |
--- a/sys-libs/libxcrypt/libxcrypt-4.4.23-r1.ebuild |
| 19 |
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.23-r1.ebuild |
| 20 |
@@ -106,8 +106,8 @@ get_xclibdir() { |
| 21 |
multilib_src_configure() { |
| 22 |
local -a myconf=( |
| 23 |
--disable-werror |
| 24 |
- --libdir=$(get_xclibdir) |
| 25 |
- --with-pkgconfigdir=/usr/$(get_libdir)/pkgconfig |
| 26 |
+ --libdir="${EPREFIX}"$(get_xclibdir) |
| 27 |
+ --with-pkgconfigdir="${EPREFIX}/usr/$(get_libdir)/pkgconfig" |
| 28 |
--includedir="${EPREFIX}/usr/include/$(usex system '' 'xcrypt')" |
| 29 |
) |
| 30 |
|
| 31 |
@@ -157,8 +157,8 @@ src_install() { |
| 32 |
) || die "failglob error" |
| 33 |
|
| 34 |
# Remove useless stuff from installation |
| 35 |
- find "${D}"/usr/share/doc/${PF} -type l -delete || die |
| 36 |
- find "${D}" -name '*.la' -delete || die |
| 37 |
+ find "${ED}"/usr/share/doc/${PF} -type l -delete || die |
| 38 |
+ find "${ED}" -name '*.la' -delete || die |
| 39 |
} |
| 40 |
|
| 41 |
multilib_src_install() { |
| 42 |
@@ -167,7 +167,7 @@ multilib_src_install() { |
| 43 |
# Don't install the libcrypt.so symlink for the "compat" version |
| 44 |
case "${MULTIBUILD_ID}" in |
| 45 |
xcrypt_compat-*) |
| 46 |
- rm "${D}"$(get_xclibdir)/libcrypt$(get_libname) \ |
| 47 |
+ rm "${ED}"$(get_xclibdir)/libcrypt$(get_libname) \ |
| 48 |
|| die "failed to remove extra compat libraries" |
| 49 |
;; |
| 50 |
xcrypt_nocompat-*) |
| 51 |
@@ -181,7 +181,7 @@ multilib_src_install() { |
| 52 |
|
| 53 |
if [[ -n ${static_libs[*]} ]]; then |
| 54 |
dodir "/usr/$(get_xclibdir)" |
| 55 |
- mv "${static_libs[@]}" "${D}/usr/$(get_xclibdir)" \ |
| 56 |
+ mv "${static_libs[@]}" "${ED}/usr/$(get_xclibdir)" \ |
| 57 |
|| die "Moving static libs failed" |
| 58 |
fi |
| 59 |
fi |
Archives