Attachment #157524 for bug #200697

Lines 3-8 Link Here

(-)mod_perl2/Makefile (+9 lines)
3		3
4	PORTNAME= mod_perl	4	PORTNAME= mod_perl
5	DISTVERSION= 2.0.9-rc2	5	DISTVERSION= 2.0.9-rc2
		6	PORTREVISION= 1
6	PORTEPOCH= 3	7	PORTEPOCH= 3
7	CATEGORIES= www perl5	8	CATEGORIES= www perl5
8	#MASTER_SITES= APACHE/perl	9	#MASTER_SITES= APACHE/perl
Lines 40-45 Link Here
40	PLIST_SUB+= AP22=""	41	PLIST_SUB+= AP22=""
41	.endif	42	.endif
42		43
		44	# Test whether the system uses a multithreaded perl
		45	HAS_ITHREADS= `${PREFIX}/bin/perl5 -e 'use Config; print $Config{useithreads} ? 1 : 0'`
		46	.if ${HAS_ITHREADS}
		47	PLIST_SUB+= ITHREADS="@comment "
		48	.else
		49	PLIST_SUB+= ITHREADS=""
		50	.endif
		51
43	CONFIGURE_ARGS= PREFIX=${PREFIX} MP_APXS=${APXS} \	52	CONFIGURE_ARGS= PREFIX=${PREFIX} MP_APXS=${APXS} \
44	MP_APR_CONFIG=${LOCALBASE}/bin/apr-1-config	53	MP_APR_CONFIG=${LOCALBASE}/bin/apr-1-config
45		54




--- src/modules/perl/modperl_error.h.orig 2015-05-30 19:49:12 UTC
+++ src/modules/perl/modperl_error.h
@@ -37,6 +37,7 @@ char *modperl_error_strerror(pTHX_ apr_status_t rc);
 
 void modperl_croak(pTHX_ apr_status_t rc, const char* func);
 
+#ifdef USE_ITHREADS
 #define MP_PUTBACK_IF_USED() STMT_START                                 \
     {                                                                   \
         modperl_interp_t *interp = modperl_thx_interp_get(aTHX);        \
@@ -44,6 +45,9 @@ void modperl_croak(pTHX_ apr_status_t rc, const char* func);
             modperl_interp_unselect(interp);                            \
         }                                                               \
     } STMT_END
+#else
+#define MP_PUTBACK_IF_USED() NOOP
+#endif
 
 #define MP_CROAK_PUTBACK(rc, func) STMT_START                           \
     {                                                                   \




%%SITE_ARCH%%/ModPerl/Const.pm
%%SITE_ARCH%%/ModPerl/FunctionMap.pm
%%SITE_ARCH%%/ModPerl/Global.pm
%%ITHREADS%%%%SITE_ARCH%%/ModPerl/InterpPool.pm
%%ITHREADS%%%%SITE_ARCH%%/ModPerl/Interpreter.pm
%%SITE_ARCH%%/ModPerl/MM.pm
%%SITE_ARCH%%/ModPerl/Manifest.pm
%%SITE_ARCH%%/ModPerl/MapUtil.pm

%%SITE_ARCH%%/ModPerl/StructureMap.pm
%%SITE_ARCH%%/ModPerl/TestReport.pm
%%SITE_ARCH%%/ModPerl/TestRun.pm
%%ITHREADS%%%%SITE_ARCH%%/ModPerl/TiPool.pm
%%ITHREADS%%%%SITE_ARCH%%/ModPerl/TiPoolConfig.pm
%%SITE_ARCH%%/ModPerl/TypeMap.pm
%%SITE_ARCH%%/ModPerl/Util.pm
%%SITE_ARCH%%/ModPerl/WrapXS.pm

%%SITE_ARCH%%/auto/Apache2/typemap
%%SITE_ARCH%%/auto/ModPerl/Const/Const.so
%%SITE_ARCH%%/auto/ModPerl/Global/Global.so
%%ITHREADS%%%%SITE_ARCH%%/auto/ModPerl/InterpPool/InterpPool.so
%%ITHREADS%%%%SITE_ARCH%%/auto/ModPerl/Interpreter/Interpreter.so
%%ITHREADS%%%%SITE_ARCH%%/auto/ModPerl/TiPool/TiPool.so
%%ITHREADS%%%%SITE_ARCH%%/auto/ModPerl/TiPoolConfig/TiPoolConfig.so
%%SITE_ARCH%%/auto/ModPerl/Util/Util.so
%%SITE_ARCH%%/mod_perl2.pm
%%PERL5_MAN3%%/APR.3.gz

Return to bug 200697

Line 0 Link Here

(-)mod_perl2/files/patch-src-modules-perl-modperl_error.h (+20 lines)
	1	--- src/modules/perl/modperl_error.h.orig 2015-05-30 19:49:12 UTC
	2	+++ src/modules/perl/modperl_error.h
	3	@@ -37,6 +37,7 @@ char *modperl_error_strerror(pTHX_ apr_status_t rc);
	4
	5	void modperl_croak(pTHX_ apr_status_t rc, const char* func);
	6
	7	+#ifdef USE_ITHREADS
	8	#define MP_PUTBACK_IF_USED() STMT_START \
	9	{ \
	10	modperl_interp_t *interp = modperl_thx_interp_get(aTHX); \
	11	@@ -44,6 +45,9 @@ void modperl_croak(pTHX_ apr_status_t rc, const char* func);
	12	modperl_interp_unselect(interp); \
	13	} \
	14	} STMT_END
	15	+#else
	16	+#define MP_PUTBACK_IF_USED() NOOP
	17	+#endif
	18
	19	#define MP_CROAK_PUTBACK(rc, func) STMT_START \
	20	{ \

Lines 160-167 Link Here

(-)mod_perl2/pkg-plist (-8 / +8 lines)
160	%%SITE_ARCH%%/ModPerl/Const.pm	160	%%SITE_ARCH%%/ModPerl/Const.pm
161	%%SITE_ARCH%%/ModPerl/FunctionMap.pm	161	%%SITE_ARCH%%/ModPerl/FunctionMap.pm
162	%%SITE_ARCH%%/ModPerl/Global.pm	162	%%SITE_ARCH%%/ModPerl/Global.pm
163	%%SITE_ARCH%%/ModPerl/InterpPool.pm	163	%%ITHREADS%%%%SITE_ARCH%%/ModPerl/InterpPool.pm
164	%%SITE_ARCH%%/ModPerl/Interpreter.pm	164	%%ITHREADS%%%%SITE_ARCH%%/ModPerl/Interpreter.pm
165	%%SITE_ARCH%%/ModPerl/MM.pm	165	%%SITE_ARCH%%/ModPerl/MM.pm
166	%%SITE_ARCH%%/ModPerl/Manifest.pm	166	%%SITE_ARCH%%/ModPerl/Manifest.pm
167	%%SITE_ARCH%%/ModPerl/MapUtil.pm	167	%%SITE_ARCH%%/ModPerl/MapUtil.pm
Lines 177-184 Link Here
177	%%SITE_ARCH%%/ModPerl/StructureMap.pm	177	%%SITE_ARCH%%/ModPerl/StructureMap.pm
178	%%SITE_ARCH%%/ModPerl/TestReport.pm	178	%%SITE_ARCH%%/ModPerl/TestReport.pm
179	%%SITE_ARCH%%/ModPerl/TestRun.pm	179	%%SITE_ARCH%%/ModPerl/TestRun.pm
180	%%SITE_ARCH%%/ModPerl/TiPool.pm	180	%%ITHREADS%%%%SITE_ARCH%%/ModPerl/TiPool.pm
181	%%SITE_ARCH%%/ModPerl/TiPoolConfig.pm	181	%%ITHREADS%%%%SITE_ARCH%%/ModPerl/TiPoolConfig.pm
182	%%SITE_ARCH%%/ModPerl/TypeMap.pm	182	%%SITE_ARCH%%/ModPerl/TypeMap.pm
183	%%SITE_ARCH%%/ModPerl/Util.pm	183	%%SITE_ARCH%%/ModPerl/Util.pm
184	%%SITE_ARCH%%/ModPerl/WrapXS.pm	184	%%SITE_ARCH%%/ModPerl/WrapXS.pm
Lines 235-244 Link Here
235	%%SITE_ARCH%%/auto/Apache2/typemap	235	%%SITE_ARCH%%/auto/Apache2/typemap
236	%%SITE_ARCH%%/auto/ModPerl/Const/Const.so	236	%%SITE_ARCH%%/auto/ModPerl/Const/Const.so
237	%%SITE_ARCH%%/auto/ModPerl/Global/Global.so	237	%%SITE_ARCH%%/auto/ModPerl/Global/Global.so
238	%%SITE_ARCH%%/auto/ModPerl/InterpPool/InterpPool.so	238	%%ITHREADS%%%%SITE_ARCH%%/auto/ModPerl/InterpPool/InterpPool.so
239	%%SITE_ARCH%%/auto/ModPerl/Interpreter/Interpreter.so	239	%%ITHREADS%%%%SITE_ARCH%%/auto/ModPerl/Interpreter/Interpreter.so
240	%%SITE_ARCH%%/auto/ModPerl/TiPool/TiPool.so	240	%%ITHREADS%%%%SITE_ARCH%%/auto/ModPerl/TiPool/TiPool.so
241	%%SITE_ARCH%%/auto/ModPerl/TiPoolConfig/TiPoolConfig.so	241	%%ITHREADS%%%%SITE_ARCH%%/auto/ModPerl/TiPoolConfig/TiPoolConfig.so
242	%%SITE_ARCH%%/auto/ModPerl/Util/Util.so	242	%%SITE_ARCH%%/auto/ModPerl/Util/Util.so
243	%%SITE_ARCH%%/mod_perl2.pm	243	%%SITE_ARCH%%/mod_perl2.pm
244	%%PERL5_MAN3%%/APR.3.gz	244	%%PERL5_MAN3%%/APR.3.gz