svn commit: r807121 - in /perl/modperl/branches/threading: ./ Changes lib/Apache2/Build.pm lib/ModPerl/BuildMM.pm lib/ModPerl/MM.pm

[torsten]

Author: torsten
Date: Mon Aug 24 08:36:30 2009
New Revision: 807121

URL: http://svn.apache.org/viewvc?rev=807121&view=rev
Log:
Merged revisions 807116 via svnmerge from 
https://svn.eu.apache.org/repos/asf/perl/modperl/trunk

........
  r807116 | torsten | 2009-08-24 10:29:43 +0200 (Mon, 24 Aug 2009) | 3 lines
  
  Fix a typo in ModPerl::BuildMM. Fix a compile time issue by introducing
  lexically scoped loop variables in ModPerl::MM::WriteMakefile().
........

Modified:
    perl/modperl/branches/threading/   (props changed)
    perl/modperl/branches/threading/Changes
    perl/modperl/branches/threading/lib/Apache2/Build.pm
    perl/modperl/branches/threading/lib/ModPerl/BuildMM.pm
    perl/modperl/branches/threading/lib/ModPerl/MM.pm

Propchange: perl/modperl/branches/threading/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 24 08:36:30 2009
@@ -1 +1 @@
-/perl/modperl/trunk:594682-672484,672819-681118,693357,700369,732889-736218,751909-752425,757553-774171
+/perl/modperl/trunk:594682-672484,672819-681118,693357,700369,732889-736218,751909-752425,757553-774171,807116

Propchange: perl/modperl/branches/threading/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Aug 24 08:36:30 2009
@@ -1 +1 @@
-/perl/modperl/trunk:1-712967,712969-806477
+/perl/modperl/trunk:1-712967,712969-807118

Modified: perl/modperl/branches/threading/Changes
URL: 
http://svn.apache.org/viewvc/perl/modperl/branches/threading/Changes?rev=807121&r1=807120&r2=807121&view=diff
==============================================================================
--- perl/modperl/branches/threading/Changes (original)
+++ perl/modperl/branches/threading/Changes Mon Aug 24 08:36:30 2009
@@ -31,6 +31,9 @@
 
 =item 2.0.5-dev
 
+Fix a typo in ModPerl::BuildMM and introduce lexically scoped loop
+variables in ModPerl::MM::WriteMakefile(). [Torsten Foertsch]
+
 Fix an XSS issue in Apache2::Status reported by Richard J. Brain
 <rich...@procheckup.com>. [Torsten Foertsch]
 

Modified: perl/modperl/branches/threading/lib/Apache2/Build.pm
URL: 
http://svn.apache.org/viewvc/perl/modperl/branches/threading/lib/Apache2/Build.pm?rev=807121&r1=807120&r2=807121&view=diff
==============================================================================
--- perl/modperl/branches/threading/lib/Apache2/Build.pm (original)
+++ perl/modperl/branches/threading/lib/Apache2/Build.pm Mon Aug 24 08:36:30 
2009
@@ -2069,6 +2069,7 @@
 }
 
 sub inc {
+    local $_;
     my @includes = map { "-I$_" } @{ shift->includes };
     "@includes";
 }

Modified: perl/modperl/branches/threading/lib/ModPerl/BuildMM.pm
URL: 
http://svn.apache.org/viewvc/perl/modperl/branches/threading/lib/ModPerl/BuildMM.pm?rev=807121&r1=807120&r2=807121&view=diff
==============================================================================
--- perl/modperl/branches/threading/lib/ModPerl/BuildMM.pm (original)
+++ perl/modperl/branches/threading/lib/ModPerl/BuildMM.pm Mon Aug 24 08:36:30 
2009
@@ -77,9 +77,9 @@
     $build ||= build_config();
     ModPerl::MM::my_import(__PACKAGE__);
 
-    my $inc;
+    my $inc = $args{INC} || '';
     $inc = $args{INC} if $args{INC};
-    $inc = " " . $build->inc;
+    $inc .= " " . $build->inc;
     if (my $glue_inc = $build->{MP_XS_GLUE_DIR}) {
         for (split /\s+/, $glue_inc) {
             $inc .= " -I$_";

Modified: perl/modperl/branches/threading/lib/ModPerl/MM.pm
URL: 
http://svn.apache.org/viewvc/perl/modperl/branches/threading/lib/ModPerl/MM.pm?rev=807121&r1=807120&r2=807121&view=diff
==============================================================================
--- perl/modperl/branches/threading/lib/ModPerl/MM.pm (original)
+++ perl/modperl/branches/threading/lib/ModPerl/MM.pm Mon Aug 24 08:36:30 2009
@@ -133,22 +133,22 @@
     my_import(__PACKAGE__);
 
     # set top-level WriteMakefile's values if weren't set already
-    for (@default_opts) {
-        $args{$_} = get_def_opt($_) unless exists $args{$_}; # already defined
+    for my $o (@default_opts) {
+        $args{$o} = get_def_opt($o) unless exists $args{$o}; # already defined
     }
 
     # set dynamic_lib-level WriteMakefile's values if weren't set already
     $args{dynamic_lib} ||= {};
     my $dlib = $args{dynamic_lib};
-    for (@default_dlib_opts) {
-        $dlib->{$_} = get_def_opt($_) unless exists $dlib->{$_};
+    for my $o (@default_dlib_opts) {
+        $dlib->{$o} = get_def_opt($o) unless exists $dlib->{$o};
     }
 
     # set macro-level WriteMakefile's values if weren't set already
     $args{macro} ||= {};
     my $macro = $args{macro};
-    for (@default_macro_opts) {
-        $macro->{$_} = get_def_opt($_) unless exists $macro->{$_};
+    for my $o (@default_macro_opts) {
+        $macro->{$o} = get_def_opt($o) unless exists $macro->{$o};
     }
 
     ExtUtils::MakeMaker::WriteMakefile(%args);