Author: stevehay Date: Wed Aug 13 13:06:22 2014 New Revision: 1617722 URL: http://svn.apache.org/r1617722 Log: Fix t/apr-ext failures when building without optimization.
APLOG_USE_MODULE() in modperl_apache_includes.h expands to a reference to perl_module, which is optimized away by -O2 when it's not used, but -O0 keeps it. Patch by Niko Tyni. See also https://bugs.debian.org/756989. Modified: perl/modperl/trunk/xs/APR/APR/Makefile.PL perl/modperl/trunk/xs/APR/PerlIO/Makefile.PL Modified: perl/modperl/trunk/xs/APR/APR/Makefile.PL URL: http://svn.apache.org/viewvc/perl/modperl/trunk/xs/APR/APR/Makefile.PL?rev=1617722&r1=1617721&r2=1617722&view=diff ============================================================================== --- perl/modperl/trunk/xs/APR/APR/Makefile.PL (original) +++ perl/modperl/trunk/xs/APR/APR/Makefile.PL Wed Aug 13 13:06:22 2014 @@ -25,6 +25,13 @@ $libs = delete $args{LIBS} if $args{LIBS my $build = ModPerl::BuildMM::build_config(); +my $ccopts = $build->ccopts; + +# avoid referencing &perl_module outside of mod_perl +$ccopts .= ' -DMP_IN_XS'; + +$args{CCFLAGS} = $ccopts; + my @apru_link_flags = $build->apru_link_flags; $libs .= join ' ', @apru_link_flags if @apru_link_flags; Modified: perl/modperl/trunk/xs/APR/PerlIO/Makefile.PL URL: http://svn.apache.org/viewvc/perl/modperl/trunk/xs/APR/PerlIO/Makefile.PL?rev=1617722&r1=1617721&r2=1617722&view=diff ============================================================================== --- perl/modperl/trunk/xs/APR/PerlIO/Makefile.PL (original) +++ perl/modperl/trunk/xs/APR/PerlIO/Makefile.PL Wed Aug 13 13:06:22 2014 @@ -25,6 +25,9 @@ if ($build->has_large_files_conflict) { : ''; } +# avoid referencing &perl_module outside of mod_perl +$ccopts .= ' -DMP_IN_XS'; + ModPerl::BuildMM::WriteMakefile( NAME => 'APR::PerlIO', VERSION_FROM => 'PerlIO.pm',
