diff options
| author | Olli Hauer <ohauer@FreeBSD.org> | 2015-06-08 21:44:38 +0000 |
|---|---|---|
| committer | Olli Hauer <ohauer@FreeBSD.org> | 2015-06-08 21:44:38 +0000 |
| commit | 1c11f670feb0490ec5cfd11cba58a60b86a9a97b (patch) | |
| tree | 6e946ca14892f9bd2c941006a4e8ba070cd1bb72 /www/mod_perl2/files | |
| parent | Add new port kannel-sqlbox (diff) | |
- add patch from upstream trunk
- mark broken with perl5.22.x
- fix pkg-plist if build against apache22 and perl with THREADS=off
PR: 15750
Submitted by: nick(_at_)foobar.org
Notes
Notes:
svn path=/head/; revision=388885
Diffstat (limited to 'www/mod_perl2/files')
| -rw-r--r-- | www/mod_perl2/files/patch-README | 14 | ||||
| -rw-r--r-- | www/mod_perl2/files/patch-src__modules__perl__modperl_error.h | 20 |
2 files changed, 34 insertions, 0 deletions
diff --git a/www/mod_perl2/files/patch-README b/www/mod_perl2/files/patch-README new file mode 100644 index 000000000000..ed8c088f34e9 --- /dev/null +++ b/www/mod_perl2/files/patch-README @@ -0,0 +1,14 @@ +--- README.orig 2015-05-30 17:49:11 UTC ++++ README +@@ -12,7 +12,10 @@ Apache: + + Perl: + Any stable version of Perl currently in support by the Perl community, +- as described in recent Perl distributions' "perlpolicy.pod" document. ++ as described in recent Perl distributions' "perlpolicy.pod" document, ++ EXCEPT THAT Perl 5.22.x is currently not supported due to the problem ++ reported in https://rt.cpan.org/Ticket/Display.html?id=101962 ++ We hope to address that in the next release (2.0.10). + + Newer Perl versions may work with this version of mod_perl. If not, + the svn version likely will (see above). diff --git a/www/mod_perl2/files/patch-src__modules__perl__modperl_error.h b/www/mod_perl2/files/patch-src__modules__perl__modperl_error.h new file mode 100644 index 000000000000..dbe6fc0c8218 --- /dev/null +++ b/www/mod_perl2/files/patch-src__modules__perl__modperl_error.h @@ -0,0 +1,20 @@ +--- src/modules/perl/modperl_error.h.orig 2015-05-30 17:49:12 UTC ++++ src/modules/perl/modperl_error.h +@@ -37,6 +37,7 @@ char *modperl_error_strerror(pTHX_ apr_s + + 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 + modperl_interp_unselect(interp); \ + } \ + } STMT_END ++#else ++#define MP_PUTBACK_IF_USED() NOOP ++#endif + + #define MP_CROAK_PUTBACK(rc, func) STMT_START \ + { \ |