[packages/apache-mod_perl] - fix building with perl 5.18 - rel 6
baggins
baggins at pld-linux.org
Mon Jun 10 14:24:44 CEST 2013
commit ab9aafc842ccf3b6232e2f349fc5e74a4f598ac7
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Mon Jun 10 14:24:32 2013 +0200
- fix building with perl 5.18
- rel 6
apache-mod_perl.spec | 4 +++-
perl-5.18.patch | 23 +++++++++++++++++++++++
2 files changed, 26 insertions(+), 1 deletion(-)
---
diff --git a/apache-mod_perl.spec b/apache-mod_perl.spec
index f2f1540..65d91bb 100644
--- a/apache-mod_perl.spec
+++ b/apache-mod_perl.spec
@@ -11,7 +11,7 @@
%define ver 2.0.7
%define snap svn1448242
-%define rel 5
+%define rel 6
Summary: A Perl interpreter for the Apache Web server
Summary(cs.UTF-8): Vestavěný interpret Perlu pro WWW server Apache
Summary(da.UTF-8): En indbygget Perl-fortolker for webtjeneren Apache
@@ -44,6 +44,7 @@ Source0: mod_perl-%{version}-%{snap}.tar.gz
# Source0-md5: 8b62bbfe8b499bc87b6d3d28eb765a24
Source1: %{name}.conf
Patch0: %{name}-Makefile_PL.patch
+Patch1: perl-5.18.patch
URL: http://perl.apache.org/
BuildRequires: apache-devel >= 2.0.55-1
BuildRequires: apr-util-devel >= 1:1.0.0
@@ -253,6 +254,7 @@ pomocnicze do testowania serwera Apache.
%prep
%setup -q -n mod_%{mod_name}-%{ver}-%{snap}
%patch0 -p1
+%patch1 -p1
%build
%{__perl} Makefile.PL \
diff --git a/perl-5.18.patch b/perl-5.18.patch
new file mode 100644
index 0000000..0cce226
--- /dev/null
+++ b/perl-5.18.patch
@@ -0,0 +1,23 @@
++++ mod_perl-2.0.7-svn1448242/src/modules/perl/modperl_perl.c 2013-02-20 08:54:50.000000000 +0100
+--- mod_perl-2.0.8/src/modules/perl/modperl_perl.c 2013-03-26 06:04:00.000000000 +0100
+@@ -265,12 +265,17 @@
+ {
+ #ifdef MP_NEED_HASH_SEED_FIXUP
+ if (MP_init_hash_seed_set) {
+-#if MP_PERL_VERSION(5, 8, 1)
+- PL_hash_seed = MP_init_hash_seed;
++#if MP_PERL_VERSION_AT_LEAST(5, 17, 6)
++ 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;
+-#else
++#elif MP_PERL_VERSION_AT_LEAST(5, 8, 2)
+ PL_rehash_seed = MP_init_hash_seed;
+ PL_rehash_seed_set = MP_init_hash_seed_set;
++#else
++ PL_hash_seed = MP_init_hash_seed;
++ PL_hash_seed_set = MP_init_hash_seed_set;
+ #endif
+ }
+ #endif
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/apache-mod_perl.git/commitdiff/ab9aafc842ccf3b6232e2f349fc5e74a4f598ac7
More information about the pld-cvs-commit
mailing list