perl-modperl-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ph...@apache.org
Subject svn commit: r1150979 - in /perl/modperl/branches/1.x: Changes Makefile.PL
Date Tue, 26 Jul 2011 03:29:20 GMT
Author: phred
Date: Tue Jul 26 03:29:19 2011
New Revision: 1150979

URL: http://svn.apache.org/viewvc?rev=1150979&view=rev
Log:
Fix error with sigils in perl binary path.
RT.cpan.org 40918

Modified:
    perl/modperl/branches/1.x/Changes
    perl/modperl/branches/1.x/Makefile.PL

Modified: perl/modperl/branches/1.x/Changes
URL: http://svn.apache.org/viewvc/perl/modperl/branches/1.x/Changes?rev=1150979&r1=1150978&r2=1150979&view=diff
==============================================================================
--- perl/modperl/branches/1.x/Changes (original)
+++ perl/modperl/branches/1.x/Changes Tue Jul 26 03:29:19 2011
@@ -10,6 +10,9 @@ all changes without author attribution a
 
 =item 1.32-dev
 
+RT 40918, fix issue with sigils in perl binary path
+[Slave Rezic <SREZIC@cpan.org>]
+
 Work around a gcc optimization specific bug which
 cuased seg faults on FreeBSD 7.x during mod_perl startup.
 [Tim Zingelman <zingelman@fnal.gov>]

Modified: perl/modperl/branches/1.x/Makefile.PL
URL: http://svn.apache.org/viewvc/perl/modperl/branches/1.x/Makefile.PL?rev=1150979&r1=1150978&r2=1150979&view=diff
==============================================================================
--- perl/modperl/branches/1.x/Makefile.PL (original)
+++ perl/modperl/branches/1.x/Makefile.PL Tue Jul 26 03:29:19 2011
@@ -786,7 +786,7 @@ if ($APACHE_SRC or $USE_APXS) {
     setup_for_static() unless $USE_APXS;
 
     iedit "$APACHE_SRC/modules/perl/Makefile",
-        "s!^PERL\\s*=.*!PERL=$Config{'perlpath'}!" unless $USE_APACI or $USE_APXS;
+        "BEGIN { require Config; Config->import } s!^PERL\\s*=.*!PERL=\$Config{'perlpath'}!"
unless $USE_APACI or $USE_APXS;
 
     for (@callback_hooks) {
         ($k,$v) = ($_,$callback_hooks{$_});



Mime
View raw message