mirror of
https://git.yoctoproject.org/poky
synced 2026-02-14 20:53:03 +01:00
perl: add patch to solve libcrypt incompatibility
Add Perl's patch submitted to upstream to be compiled along with glibc with libcrypt split. (From OE-Core rev: 79703d83790a2973fefdb0e12e125b5f17e98cdf) Signed-off-by: Charles-Antoine Couret <charles-antoine.couret@essensium.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
5264dbd39d
commit
d5664c3ad4
@@ -15,6 +15,7 @@ SRC_URI += "\
|
||||
file://dynaloaderhack.patch \
|
||||
file://perl-PathTools-don-t-filter-out-blib-from-INC.patch \
|
||||
file://0001-Configure-Remove-fstack-protector-strong-for-native-.patch \
|
||||
file://perl-5.26.1-guard_old_libcrypt_fix.patch \
|
||||
"
|
||||
|
||||
SRC_URI[md5sum] = "af6a84c7c3e2b8b269c105a5db2f6d53"
|
||||
|
||||
@@ -0,0 +1,28 @@
|
||||
commit 13e70b397dcb0d1bf4a869b670f041c1d7b730d0
|
||||
Author: Bjรถrn Esser <besser82@fedoraproject.org>
|
||||
Date: Sat Jan 20 20:22:53 2018 +0100
|
||||
|
||||
pp: Guard fix for really old bug in glibc libcrypt
|
||||
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by Richard Purdie <richard.purdie@linuxfoundation.org>
|
||||
|
||||
diff --git a/pp.c b/pp.c
|
||||
index d50ad7ddbf..6510c7b15c 100644
|
||||
--- a/pp.c
|
||||
+++ b/pp.c
|
||||
@@ -3650,8 +3650,12 @@ PP(pp_crypt)
|
||||
#if defined(__GLIBC__) || defined(__EMX__)
|
||||
if (PL_reentrant_buffer->_crypt_struct_buffer) {
|
||||
PL_reentrant_buffer->_crypt_struct_buffer->initialized = 0;
|
||||
- /* work around glibc-2.2.5 bug */
|
||||
+#if (defined(__GLIBC__) && __GLIBC__ == 2) && \
|
||||
+ (defined(__GLIBC_MINOR__) && __GLIBC_MINOR__ >= 2 && __GLIBC_MINOR__ < 4)
|
||||
+ /* work around glibc-2.2.5 bug, has been fixed at some
|
||||
+ * time in glibc-2.3.X */
|
||||
PL_reentrant_buffer->_crypt_struct_buffer->current_saltbits = 0;
|
||||
+#endif
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -63,6 +63,7 @@ SRC_URI += " \
|
||||
file://perl-errno-generation-gcc5.patch \
|
||||
file://perl-fix-conflict-between-skip_all-and-END.patch \
|
||||
file://perl-test-customized.patch \
|
||||
file://perl-5.26.1-guard_old_libcrypt_fix.patch \
|
||||
"
|
||||
|
||||
# Fix test case issues
|
||||
|
||||
Reference in New Issue
Block a user