Author: stevehay
Date: Wed Aug 13 13:13:34 2014
New Revision: 1617727
URL: http://svn.apache.org/r1617727
Log:
Simplify the avoidance of perl_module in places where it isn't (really) defined
Revision 1617722 pointed out an easier way to achieve what was done by revision
1502392. (Unfortunately, modperl_dummy.c is currently still required for the
three other symbols that it provides, added by revision 1538006.)
Modified:
perl/modperl/trunk/xs/APR/Const/Makefile.PL
perl/modperl/trunk/xs/APR/aprext/Makefile.PL
perl/modperl/trunk/xs/APR/aprext/modperl_dummy.c
Modified: perl/modperl/trunk/xs/APR/Const/Makefile.PL
URL:
http://svn.apache.org/viewvc/perl/modperl/trunk/xs/APR/Const/Makefile.PL?rev=1617727&r1=1617726&r2=1617727&view=diff
==============================================================================
--- perl/modperl/trunk/xs/APR/Const/Makefile.PL (original)
+++ perl/modperl/trunk/xs/APR/Const/Makefile.PL Wed Aug 13 13:13:34 2014
@@ -1,7 +1,15 @@
use lib qw(../lib);
use ModPerl::BuildMM ();
+use Apache2::Build;
+
+my $build = Apache2::Build->build_config();
+my $ccopts = $build->ccopts;
+
+# avoid referencing &perl_module outside of mod_perl
+$ccopts .= ' -DMP_IN_XS';
ModPerl::BuildMM::WriteMakefile(
NAME => 'APR::Const',
VERSION_FROM => 'Const.pm',
+ CCFLAGS => $ccopts,
);
Modified: perl/modperl/trunk/xs/APR/aprext/Makefile.PL
URL:
http://svn.apache.org/viewvc/perl/modperl/trunk/xs/APR/aprext/Makefile.PL?rev=1617727&r1=1617726&r2=1617727&view=diff
==============================================================================
--- perl/modperl/trunk/xs/APR/aprext/Makefile.PL (original)
+++ perl/modperl/trunk/xs/APR/aprext/Makefile.PL Wed Aug 13 13:13:34 2014
@@ -33,6 +33,13 @@ my %args = (NAME => 'lib' . $bu
clean => { FILES => "@clean" },
);
+my $ccopts = $build->ccopts;
+
+# avoid referencing &perl_module outside of mod_perl
+$ccopts .= ' -DMP_IN_XS';
+
+$args{CCFLAGS} = $ccopts;
+
ModPerl::BuildMM::WriteMakefile(%args);
# avoid redefined warnings from imported postamble symbol from
Modified: perl/modperl/trunk/xs/APR/aprext/modperl_dummy.c
URL:
http://svn.apache.org/viewvc/perl/modperl/trunk/xs/APR/aprext/modperl_dummy.c?rev=1617727&r1=1617726&r2=1617727&view=diff
==============================================================================
--- perl/modperl/trunk/xs/APR/aprext/modperl_dummy.c (original)
+++ perl/modperl/trunk/xs/APR/aprext/modperl_dummy.c Wed Aug 13 13:13:34 2014
@@ -16,21 +16,6 @@
#include "mod_perl.h"
-/* FIXME: To define extern perl_module to something so libaprext.lib can be
- * linked without error when building against httpd-2.4+. (The symbol is
- * referenced by modperl_apache_compat.h for httpd-2.4+, so must be defined
- * somewhere in that case.)
- */
-module AP_MODULE_DECLARE_DATA perl_module = {
- STANDARD20_MODULE_STUFF,
- NULL, /* dir config creater */
- NULL, /* dir merger --- default is to override */
- NULL, /* server config */
- NULL, /* merge server config */
- NULL, /* table of config file commands */
- NULL, /* register hooks */
-};
-
/* FIXME: These functions are called from modperl_trace() in libaprext.lib
* but are normally defined in mod_perl.c which can't be included.
*/
