| 1 |
commit: 37e41391d7c52a73bef95a72e37992744bf2cbc4 |
| 2 |
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org> |
| 3 |
AuthorDate: Sat Feb 8 00:17:34 2020 +0000 |
| 4 |
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Feb 8 00:50:31 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37e41391 |
| 7 |
|
| 8 |
sys-libs/libxcrypt: Fix installation with USE="split-usr system". |
| 9 |
|
| 10 |
Do not install 3 unnecessary copies of full library (regular file) for each non-native ABI: |
| 11 |
/usr/$(get_libdir)/libcrypt.so |
| 12 |
/usr/$(get_libdir)/libowcrypt.so |
| 13 |
/usr/$(get_libdir)/libxcrypt.so |
| 14 |
|
| 15 |
Do not install unnecessary symlinks for each ABI: |
| 16 |
/usr/$(get_libdir)/libcrypt.so.2 |
| 17 |
/usr/$(get_libdir)/libowcrypt.so.2 |
| 18 |
/usr/$(get_libdir)/libxcrypt.so.2 |
| 19 |
|
| 20 |
Do not use gen_usr_ldscript(). |
| 21 |
|
| 22 |
No changes for other combinations of USE flags. |
| 23 |
|
| 24 |
Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org> |
| 25 |
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org> |
| 26 |
|
| 27 |
...4.4.12-r2.ebuild => libxcrypt-4.4.12-r3.ebuild} | 23 ++++++++++------------ |
| 28 |
1 file changed, 10 insertions(+), 13 deletions(-) |
| 29 |
|
| 30 |
diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.12-r2.ebuild b/sys-libs/libxcrypt/libxcrypt-4.4.12-r3.ebuild |
| 31 |
similarity index 84% |
| 32 |
rename from sys-libs/libxcrypt/libxcrypt-4.4.12-r2.ebuild |
| 33 |
rename to sys-libs/libxcrypt/libxcrypt-4.4.12-r3.ebuild |
| 34 |
index eb95be5ae56..166f638a579 100644 |
| 35 |
--- a/sys-libs/libxcrypt/libxcrypt-4.4.12-r2.ebuild |
| 36 |
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.12-r3.ebuild |
| 37 |
@@ -1,9 +1,9 @@ |
| 38 |
-# Copyright 1999-2020 Gentoo Authors |
| 39 |
+# Copyright 2004-2020 Gentoo Authors |
| 40 |
# Distributed under the terms of the GNU General Public License v2 |
| 41 |
|
| 42 |
EAPI=7 |
| 43 |
PYTHON_COMPAT=( python3_{6,7,8} ) |
| 44 |
-inherit autotools multibuild python-any-r1 usr-ldscript multilib-minimal |
| 45 |
+inherit autotools multibuild python-any-r1 multilib-minimal |
| 46 |
|
| 47 |
DESCRIPTION="Extended crypt library for descrypt, md5crypt, bcrypt, and others " |
| 48 |
SRC_URI="https://github.com/besser82/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
| 49 |
@@ -105,7 +105,7 @@ src_install() { |
| 50 |
( |
| 51 |
shopt -s failglob || die "failglob failed" |
| 52 |
|
| 53 |
- # make sure out man pages don't collide with glibc or man-pages |
| 54 |
+ # Make sure our man pages do not collide with glibc or man-pages. |
| 55 |
for manpage in "${ED}"/usr/share/man/man3/crypt{,_r}.?*; do |
| 56 |
mv -n "${manpage}" "$(dirname "${manpage}")/xcrypt_$(basename "${manpage}")" \ |
| 57 |
|| die "mv failed" |
| 58 |
@@ -143,20 +143,17 @@ multilib_src_install() { |
| 59 |
fi |
| 60 |
|
| 61 |
if use system; then |
| 62 |
- # now try to find libraries and make sure to generate |
| 63 |
- # ldscripts for them |
| 64 |
+ # Move versionless .so symlinks from /$(get_libdir) to /usr/$(get_libdir) |
| 65 |
+ # to allow linker to correctly find shared libraries. |
| 66 |
shopt -s failglob || die "failglob failed" |
| 67 |
|
| 68 |
for lib_file in "${ED}"$(get_xclibdir)/*$(get_libname); do |
| 69 |
- libname="$(basename "${lib_file}")" |
| 70 |
- |
| 71 |
- cp -L "${lib_file}" \ |
| 72 |
- "${ED}/usr/$(get_xclibdir)/${libname}" \ |
| 73 |
- || die "copying ${libname} failed" |
| 74 |
- |
| 75 |
- gen_usr_ldscript ${libname} |
| 76 |
- dosym ${libname} /usr/$(get_xclibdir)/${libname}.2 |
| 77 |
+ lib_file_basename="$(basename "${lib_file}")" |
| 78 |
+ lib_file_target="$(basename "$(readlink -f "${lib_file}")")" |
| 79 |
+ dosym "../../$(get_libdir)/${lib_file_target}" "/usr/$(get_xclibdir)/${lib_file_basename}" |
| 80 |
done |
| 81 |
+ |
| 82 |
+ rm "${ED}"$(get_xclibdir)/*$(get_libname) || die "removing symlinks in incorrect location failed" |
| 83 |
fi |
| 84 |
) |
| 85 |
fi |
Archives