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