diff options
| author |   Charles-Antoine Couret <charles-antoine.couret@essensium.com> | 2018-04-06 14:53:54 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-04-07 11:43:36 +0100 |
| commit | 79703d83790a2973fefdb0e12e125b5f17e98cdf (patch) | |
| tree | 1ac5d7618846a9f96b520deb2a8039da5496c8a5 | |
| parent | ca17a7bbea5f5454da43545d544ff7772d83ac19 (diff) | |
| download | openembedded-core-79703d83790a2973fefdb0e12e125b5f17e98cdf.tar.gz | |
perl: add patch to solve libcrypt incompatibility
Add Perl's patch submitted to upstream to be compiled along with glibc with libcrypt split.
Signed-off-by: Charles-Antoine Couret <charles-antoine.couret@essensium.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-devtools/perl/perl-native_5.24.1.bb | 1 | ||||
| -rw-r--r-- | meta/recipes-devtools/perl/perl/perl-5.26.1-guard_old_libcrypt_fix.patch | 28 | ||||
| -rw-r--r-- | meta/recipes-devtools/perl/perl_5.24.1.bb | 1 |
3 files changed, 30 insertions, 0 deletions
diff --git a/meta/recipes-devtools/perl/perl-native_5.24.1.bb b/meta/recipes-devtools/perl/perl-native_5.24.1.bb index 48113f05a9..a9ab17d16c 100644 --- a/meta/recipes-devtools/perl/perl-native_5.24.1.bb +++ b/meta/recipes-devtools/perl/perl-native_5.24.1.bb @@ -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" diff --git a/meta/recipes-devtools/perl/perl/perl-5.26.1-guard_old_libcrypt_fix.patch b/meta/recipes-devtools/perl/perl/perl-5.26.1-guard_old_libcrypt_fix.patch new file mode 100644 index 0000000000..bb6c573c9a --- /dev/null +++ b/meta/recipes-devtools/perl/perl/perl-5.26.1-guard_old_libcrypt_fix.patch @@ -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 + } + diff --git a/meta/recipes-devtools/perl/perl_5.24.1.bb b/meta/recipes-devtools/perl/perl_5.24.1.bb index e5b4886a95..66ccd7f0be 100644 --- a/meta/recipes-devtools/perl/perl_5.24.1.bb +++ b/meta/recipes-devtools/perl/perl_5.24.1.bb @@ -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 |