| 1 |
commit: d6535cc0b605b03af4e35cff1bf8ba9f0691dfaf |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jul 16 22:09:32 2021 +0000 |
| 4 |
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jul 17 17:11:04 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6535cc0 |
| 7 |
|
| 8 |
sys-libs/glibc: add preserve-libs for libcrypt |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/802207 |
| 11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 12 |
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> |
| 13 |
|
| 14 |
.../{glibc-9999.ebuild => glibc-2.33-r3.ebuild} | 21 +++++++++++++++++---- |
| 15 |
sys-libs/glibc/glibc-9999.ebuild | 16 +++++++++++++++- |
| 16 |
2 files changed, 32 insertions(+), 5 deletions(-) |
| 17 |
|
| 18 |
diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-2.33-r3.ebuild |
| 19 |
similarity index 98% |
| 20 |
copy from sys-libs/glibc/glibc-9999.ebuild |
| 21 |
copy to sys-libs/glibc/glibc-2.33-r3.ebuild |
| 22 |
index e2bc0dad866..73e8908484d 100644 |
| 23 |
--- a/sys-libs/glibc/glibc-9999.ebuild |
| 24 |
+++ b/sys-libs/glibc/glibc-2.33-r3.ebuild |
| 25 |
@@ -6,7 +6,7 @@ EAPI=7 |
| 26 |
PYTHON_COMPAT=( python3_{7,8,9,10} ) |
| 27 |
TMPFILES_OPTIONAL=1 |
| 28 |
|
| 29 |
-inherit python-any-r1 prefix toolchain-funcs flag-o-matic gnuconfig \ |
| 30 |
+inherit python-any-r1 prefix preserve-libs toolchain-funcs flag-o-matic gnuconfig \ |
| 31 |
multilib systemd multiprocessing tmpfiles |
| 32 |
|
| 33 |
DESCRIPTION="GNU libc C library" |
| 34 |
@@ -17,14 +17,13 @@ SLOT="2.2" |
| 35 |
EMULTILIB_PKG="true" |
| 36 |
|
| 37 |
# Gentoo patchset (ignored for live ebuilds) |
| 38 |
-PATCH_VER=16 |
| 39 |
-PATCH_DEV=slyfox |
| 40 |
+PATCH_VER=4 |
| 41 |
+PATCH_DEV=dilfridge |
| 42 |
|
| 43 |
if [[ ${PV} == 9999* ]]; then |
| 44 |
inherit git-r3 |
| 45 |
else |
| 46 |
#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" |
| 47 |
- KEYWORDS="" |
| 48 |
SRC_URI="mirror://gnu/glibc/${P}.tar.xz" |
| 49 |
SRC_URI+=" https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${P}-patches-${PATCH_VER}.tar.xz" |
| 50 |
fi |
| 51 |
@@ -1489,6 +1488,16 @@ pkg_preinst() { |
| 52 |
# https://bugs.gentoo.org/753740 |
| 53 |
rm "${EROOT}"/usr/lib/locale || die |
| 54 |
fi |
| 55 |
+ |
| 56 |
+ # Keep around libcrypt so that Perl doesn't break when merging libxcrypt |
| 57 |
+ # (libxcrypt is the new provider for now of libcrypt.so.{1,2}). |
| 58 |
+ # bug #802207 |
| 59 |
+ if has_version "${CATEGORY}/${PN}[crypt]"; then |
| 60 |
+ PRESERVED_OLD_LIBCRYPT=1 |
| 61 |
+ preserve_old_lib /$(get_libdir)/libcrypt$(get_libname 1) |
| 62 |
+ else |
| 63 |
+ PRESERVED_OLD_LIBCRYPT=0 |
| 64 |
+ fi |
| 65 |
} |
| 66 |
|
| 67 |
pkg_postinst() { |
| 68 |
@@ -1518,4 +1527,8 @@ pkg_postinst() { |
| 69 |
fi |
| 70 |
done |
| 71 |
fi |
| 72 |
+ |
| 73 |
+ if [[ ${PRESERVED_OLD_LIBCRYPT} -eq 1 ]] ; then |
| 74 |
+ preserve_old_lib_notify /$(get_libdir)/libcrypt$(get_libname 1) |
| 75 |
+ fi |
| 76 |
} |
| 77 |
|
| 78 |
diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild |
| 79 |
index e2bc0dad866..b3fc7c71c7b 100644 |
| 80 |
--- a/sys-libs/glibc/glibc-9999.ebuild |
| 81 |
+++ b/sys-libs/glibc/glibc-9999.ebuild |
| 82 |
@@ -6,7 +6,7 @@ EAPI=7 |
| 83 |
PYTHON_COMPAT=( python3_{7,8,9,10} ) |
| 84 |
TMPFILES_OPTIONAL=1 |
| 85 |
|
| 86 |
-inherit python-any-r1 prefix toolchain-funcs flag-o-matic gnuconfig \ |
| 87 |
+inherit python-any-r1 prefix preserve-libs toolchain-funcs flag-o-matic gnuconfig \ |
| 88 |
multilib systemd multiprocessing tmpfiles |
| 89 |
|
| 90 |
DESCRIPTION="GNU libc C library" |
| 91 |
@@ -1489,6 +1489,16 @@ pkg_preinst() { |
| 92 |
# https://bugs.gentoo.org/753740 |
| 93 |
rm "${EROOT}"/usr/lib/locale || die |
| 94 |
fi |
| 95 |
+ |
| 96 |
+ # Keep around libcrypt so that Perl doesn't break when merging libxcrypt |
| 97 |
+ # (libxcrypt is the new provider for now of libcrypt.so.{1,2}). |
| 98 |
+ # bug #802207 |
| 99 |
+ if has_version "${CATEGORY}/${PN}[crypt]"; then |
| 100 |
+ PRESERVED_OLD_LIBCRYPT=1 |
| 101 |
+ preserve_old_lib /$(get_libdir)/libcrypt$(get_libname 1) |
| 102 |
+ else |
| 103 |
+ PRESERVED_OLD_LIBCRYPT=0 |
| 104 |
+ fi |
| 105 |
} |
| 106 |
|
| 107 |
pkg_postinst() { |
| 108 |
@@ -1518,4 +1528,8 @@ pkg_postinst() { |
| 109 |
fi |
| 110 |
done |
| 111 |
fi |
| 112 |
+ |
| 113 |
+ if [[ ${PRESERVED_OLD_LIBCRYPT} -eq 1 ]] ; then |
| 114 |
+ preserve_old_lib_notify /$(get_libdir)/libcrypt$(get_libname 1) |
| 115 |
+ fi |
| 116 |
} |
Archives