rpms/mod_perl/devel mod_perl-2.0.3-perl510.patch, NONE, 1.1 mod_perl.spec, 1.56, 1.57

[Joe Orton (jorton)]

Author: jorton

Update of /cvs/extras/rpms/mod_perl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26515

Modified Files:
	mod_perl.spec 
Added Files:
	mod_perl-2.0.3-perl510.patch 
Log Message:
* Wed Jan 30 2008 Joe Orton <jorton at redhat.com> 2.0.3-18
- fix build with perl 5.10 (upstream r480890)


mod_perl-2.0.3-perl510.patch:

--- NEW FILE mod_perl-2.0.3-perl510.patch ---

http://svn.apache.org/viewvc?view=rev&revision=480890

--- mod_perl-2.0.3/src/modules/perl/modperl_interp.h.perl510
+++ mod_perl-2.0.3/src/modules/perl/modperl_interp.h
@@ -44,8 +44,15 @@ apr_status_t modperl_interp_cleanup(void
 #endif
 
 #ifndef HvPMROOT
+# if PERL_REVISION == 5 && \
+    ((PERL_VERSION == 9 && PERL_SUBVERSION > 4) || \
+    PERL_VERSION > 9)
+#define MP_THX_INTERP_SET(thx, interp)                          \
+    ((XPVMG*)SvANY(*Perl_Imodglobal_ptr(thx)))->xmg_u.xmg_magic = (MAGIC*)interp
+# else
 #define MP_THX_INTERP_SET(thx, interp)                          \
     ((XPVMG*)SvANY(*Perl_Imodglobal_ptr(thx)))->xmg_magic = (MAGIC*)interp
+# endif
 #else
 #define MP_THX_INTERP_SET(thx, interp)                          \
     HvPMROOT(*Perl_Imodglobal_ptr(thx)) = (PMOP*)interp
--- mod_perl-2.0.3/src/modules/perl/mod_perl.c.perl510
+++ mod_perl-2.0.3/src/modules/perl/mod_perl.c
@@ -584,6 +584,15 @@ static apr_status_t modperl_sys_init(voi
 
 static apr_status_t modperl_sys_term(void *data)
 {
+    /* PERL_SYS_TERM() needs 'my_perl' as of 5.9.5 */
+#ifdef USE_ITHREADS
+# if PERL_REVISION == 5 && \
+  ((PERL_VERSION == 9 && PERL_SUBVERSION > 4) || \
+   PERL_VERSION > 9)
+    modperl_cleanup_data_t *cdata = (modperl_cleanup_data_t *)data;
+    PerlInterpreter *my_perl = (PerlInterpreter *)cdata->data;
+# endif
+#endif
     MP_init_status = 0;
     MP_threads_started = 0;
     MP_post_post_config_phase = 0;


Index: mod_perl.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_perl/devel/mod_perl.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- mod_perl.spec	29 Jan 2008 23:47:55 -0000	1.56
+++ mod_perl.spec	30 Jan 2008 14:40:25 -0000	1.57
@@ -2,7 +2,7 @@
 
 Name:           mod_perl
 Version:        2.0.3
-Release:        17
+Release:        18
 Summary:        An embedded Perl interpreter for the Apache HTTP Server
 
 Group:          System Environment/Daemons
@@ -13,6 +13,7 @@
 Source2:        filter-requires.sh
 Source3:        filter-provides.sh
 Patch0:         mod_perl-2.0.2-multilib.patch
+Patch1:         mod_perl-2.0.3-perl510.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl-devel, perl(ExtUtils::Embed)
@@ -49,6 +50,7 @@
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1
+%patch1 -p1 -b .perl510
 
 %build
 CFLAGS="$RPM_OPT_FLAGS -fpic" %{__perl} Makefile.PL </dev/null \
@@ -127,6 +129,9 @@
 %{_includedir}/httpd/*
 
 %changelog
+* Wed Jan 30 2008 Joe Orton <jorton at redhat.com> 2.0.3-18
+- fix build with perl 5.10 (upstream r480890)
+
 * Tue Jan 29 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.3-17
 - fix perl BR