b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

perlPackages.mod_perl2: fix build on perl-5.34.0

Browse source
This commit is contained in:
Stig Palmquist 2021-08-13 15:10:35 +02:00
parent 5e5e744449
commit c4095d0e41
3 changed files with 24 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkgs/development/perl-modules/mod_perl2-PL_hash_seed.patch Normal file
View file

@ -0,0 +1,13 @@
From https://github.com/Perl/perl5/issues/18617#issuecomment-822056978 by Leont
--- a/src/modules/perl/modperl_perl.c
+++ a/src/modules/perl/modperl_perl.c
@@ -268,7 +268,7 @@
#ifdef MP_NEED_HASH_SEED_FIXUP
if (MP_init_hash_seed_set) {
#if MP_PERL_VERSION_AT_LEAST(5, 17, 6)
- memcpy(&PL_hash_seed, &MP_init_hash_seed,
+ memcpy(PL_hash_seed, &MP_init_hash_seed,
sizeof(PL_hash_seed) > sizeof(MP_init_hash_seed) ?
sizeof(MP_init_hash_seed) : sizeof(PL_hash_seed));
PL_hash_seed_set = MP_init_hash_seed_set;

5
pkgs/servers/http/apache-modules/mod_perl/default.nix
View file

@ -9,6 +9,11 @@ stdenv.mkDerivation rec {
sha256 = "0x3gq4nz96y202cymgrf56n8spm7bffkd1p74dh9q3zrrlc9wana";
};
patches = [
# Fix build on perl-5.34.0, https://github.com/Perl/perl5/issues/18617
../../../../development/perl-modules/mod_perl2-PL_hash_seed.patch
];
buildInputs = [ apacheHttpd perl ];
buildPhase = ''
perl Makefile.PL \

6
pkgs/top-level/perl-packages.nix
View file

@ -13678,6 +13678,12 @@ let
url = "mirror://cpan/authors/id/S/SH/SHAY/mod_perl-2.0.11.tar.gz";
sha256 = "0x3gq4nz96y202cymgrf56n8spm7bffkd1p74dh9q3zrrlc9wana";
};
patches = [
# Fix build on perl-5.34.0, https://github.com/Perl/perl5/issues/18617
../development/perl-modules/mod_perl2-PL_hash_seed.patch
];
makeMakerFlags = "MP_AP_DESTDIR=$out";
buildInputs = [ pkgs.apacheHttpd ];
doCheck = false; # would try to start Apache HTTP server