diff options
| author |   Sam James <sam@gentoo.org> | 2021-10-21 06:42:31 +0000 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2021-10-21 06:44:20 +0000 |
| commit | 09e05d8e76dac3c6b911a06862783d10080c9095 (patch) | |
| tree | 99a84d92c49c41bee8d1b25ea693bad935c60c0c /sys-libs/libxcrypt | |
| parent | dev-python/logfury: Add python@ as co-maint. (diff) | |
| download | gentoo-09e05d8e76dac3c6b911a06862783d10080c9095.tar.gz gentoo-09e05d8e76dac3c6b911a06862783d10080c9095.tar.bz2 gentoo-09e05d8e76dac3c6b911a06862783d10080c9095.zip | |
sys-libs/libxcrypt: backport prefix fixes to 4.4.20
Needed for the relatively-new stable Prefix.
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'sys-libs/libxcrypt')
| -rw-r--r-- | sys-libs/libxcrypt/libxcrypt-4.4.20.ebuild | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.20.ebuild b/sys-libs/libxcrypt/libxcrypt-4.4.20.ebuild index f31e856bc889..6b7c1ae7612f 100644 --- a/sys-libs/libxcrypt/libxcrypt-4.4.20.ebuild +++ b/sys-libs/libxcrypt/libxcrypt-4.4.20.ebuild @@ -106,8 +106,8 @@ get_xclibdir() { multilib_src_configure() { local -a myconf=( --disable-werror - --libdir=$(get_xclibdir) - --with-pkgconfigdir=/usr/$(get_libdir)/pkgconfig + --libdir="${EPREFIX}"$(get_xclibdir) + --with-pkgconfigdir="${EPREFIX}/usr/$(get_libdir)/pkgconfig" --includedir="${EPREFIX}/usr/include/$(usex system '' 'xcrypt')" ) @@ -157,8 +157,8 @@ src_install() { ) || die "failglob error" # Remove useless stuff from installation - find "${D}"/usr/share/doc/${PF} -type l -delete || die - find "${D}" -name '*.la' -delete || die + find "${ED}"/usr/share/doc/${PF} -type l -delete || die + find "${ED}" -name '*.la' -delete || die } multilib_src_install() { @@ -167,7 +167,7 @@ multilib_src_install() { # Don't install the libcrypt.so symlink for the "compat" version case "${MULTIBUILD_ID}" in xcrypt_compat-*) - rm "${D}"$(get_xclibdir)/libcrypt$(get_libname) \ + rm "${ED}"$(get_xclibdir)/libcrypt$(get_libname) \ || die "failed to remove extra compat libraries" ;; xcrypt_nocompat-*) @@ -181,7 +181,7 @@ multilib_src_install() { if [[ -n ${static_libs[*]} ]]; then dodir "/usr/$(get_xclibdir)" - mv "${static_libs[@]}" "${D}/usr/$(get_xclibdir)" \ + mv "${static_libs[@]}" "${ED}/usr/$(get_xclibdir)" \ || die "Moving static libs failed" fi fi |