perlPackages.mod_perl2: fix build on perl-5.34.0
This commit is contained in:
parent
5e5e744449
commit
c4095d0e41
13
pkgs/development/perl-modules/mod_perl2-PL_hash_seed.patch
Normal file
13
pkgs/development/perl-modules/mod_perl2-PL_hash_seed.patch
Normal 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;
|
|
@ -9,6 +9,11 @@ stdenv.mkDerivation rec {
|
||||||
sha256 = "0x3gq4nz96y202cymgrf56n8spm7bffkd1p74dh9q3zrrlc9wana";
|
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 ];
|
buildInputs = [ apacheHttpd perl ];
|
||||||
buildPhase = ''
|
buildPhase = ''
|
||||||
perl Makefile.PL \
|
perl Makefile.PL \
|
||||||
|
|
|
@ -13678,6 +13678,12 @@ let
|
||||||
url = "mirror://cpan/authors/id/S/SH/SHAY/mod_perl-2.0.11.tar.gz";
|
url = "mirror://cpan/authors/id/S/SH/SHAY/mod_perl-2.0.11.tar.gz";
|
||||||
sha256 = "0x3gq4nz96y202cymgrf56n8spm7bffkd1p74dh9q3zrrlc9wana";
|
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";
|
makeMakerFlags = "MP_AP_DESTDIR=$out";
|
||||||
buildInputs = [ pkgs.apacheHttpd ];
|
buildInputs = [ pkgs.apacheHttpd ];
|
||||||
doCheck = false; # would try to start Apache HTTP server
|
doCheck = false; # would try to start Apache HTTP server
|
||||||
|
|
Loading…
Reference in a new issue