You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@perl.apache.org by Stas Bekman <st...@stason.org> on 2004/07/01 00:48:13 UTC

Re: [mp2] recent 5.6.x breakage

Doing binary search on various checkout dates, it showed that the guilty 
change is:

diff -ru --exclude=CVS mp2-20040620/Makefile.PL mp2-20040621/Makefile.PL
--- mp2-20040620/Makefile.PL	2004-03-03 19:36:18.000000000 -0800
+++ mp2-20040621/Makefile.PL	2004-06-20 23:45:54.000000000 -0700
@@ -153,11 +153,19 @@
          #Makefile.PL's in WrapXS/ just need to pass the -e mod_perl.lib test
          #the real mod_perl.lib will be in place when WrapXS/ dll's are
          #actually linked
-        my $lib = "src/modules/perl/$build->{MP_LIBNAME}.lib";
-        unless (-e $lib) {
-            open my $fh, '>', $lib or die "open $lib: $!";
-            print $fh "#this is a dummy file to trick MakeMaker";
-            close $fh;
+        require File::Path;
+        my $lib1 = "src/modules/perl/$build->{MP_LIBNAME}.lib";
+        my $apr_blib = catdir qw(blib arch Apache2 auto APR);
+        unless (-d $apr_blib) {
+            File::Path::mkpath($apr_blib) or die "mkdir $apr_blib failed: $!";
+        }
+        my $lib2 = catfile $apr_blib, 'APR.lib';
+        foreach my $lib ($lib1, $lib2) {
+            unless (-e $lib) {
+                open my $fh, '>', $lib or die "open $lib: $!";
+                print $fh "#this is a dummy file to trick MakeMaker";
+                close $fh;
+            }
          }
      }

@@ -448,6 +456,8 @@
  package MY;

  use Config;
+use File::Spec::Functions qw(catdir);
+use constant WIN32 => $^O eq 'MSWin32';

  my $apache_test_install;
  BEGIN {
@@ -460,6 +470,18 @@
      my $self = shift;
      my $string = $self->ModPerl::BuildMM::MY::top_targets;

+    if (WIN32) {
+        ModPerl::MM::add_dep(\$string, pure_all => 'apr_lib');
+
+        my $apr_lib = catdir qw(xs APR APR);
+        $string .= <<"EOF";
+
+apr_lib:
+	cd "$apr_lib" && \$(MAKE) -f \$(FIRST_MAKEFILE) all \$(PASTHRU)
+
+EOF
+    }
+
      ModPerl::MM::add_dep(\$string, pure_all => 'modperl_lib');

      $string .= <<'EOF';

-- 
__________________________________________________________________
Stas Bekman            JAm_pH ------> Just Another mod_perl Hacker
http://stason.org/     mod_perl Guide ---> http://perl.apache.org
mailto:stas@stason.org http://use.perl.org http://apacheweek.com
http://modperlbook.org http://apache.org   http://ticketmaster.com

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@perl.apache.org
For additional commands, e-mail: dev-help@perl.apache.org


Re: [mp2] recent 5.6.x breakage

Posted by Stas Bekman <st...@stason.org>.
Randy Kobes wrote:
> On Wed, 30 Jun 2004, Stas Bekman wrote:
> 
> 
>>Stas Bekman wrote:
>>
>>>Doing binary search on various checkout dates, it showed
>>>that the guilty change is:
> 
> 
> Nice work, Stas! Sorry for causing you the extra work -
> I'm sure you didn't need it ...

Ah, no worries Randy, you couldn't have known about this MakeMaker <fill in 
here the right word>. Your code was perfectly correct.

-- 
__________________________________________________________________
Stas Bekman            JAm_pH ------> Just Another mod_perl Hacker
http://stason.org/     mod_perl Guide ---> http://perl.apache.org
mailto:stas@stason.org http://use.perl.org http://apacheweek.com
http://modperlbook.org http://apache.org   http://ticketmaster.com

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@perl.apache.org
For additional commands, e-mail: dev-help@perl.apache.org


Re: [mp2] recent 5.6.x breakage

Posted by Randy Kobes <ra...@theoryx5.uwinnipeg.ca>.
On Wed, 30 Jun 2004, Stas Bekman wrote:

> Stas Bekman wrote:
> > Doing binary search on various checkout dates, it showed
> > that the guilty change is:

Nice work, Stas! Sorry for causing you the extra work -
I'm sure you didn't need it ...

-- 
best regards,
randy


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@perl.apache.org
For additional commands, e-mail: dev-help@perl.apache.org


Re: [mp2] recent 5.6.x breakage

Posted by Stas Bekman <st...@stason.org>.
Stas Bekman wrote:
> Doing binary search on various checkout dates, it showed that the guilty 
> change is:

And the fix (workaround) is:

Index: Makefile.PL
===================================================================
RCS file: /home/cvs/modperl-2.0/Makefile.PL,v
retrieving revision 1.140
diff -u -r1.140 Makefile.PL
--- Makefile.PL 27 Jun 2004 23:41:06 -0000      1.140
+++ Makefile.PL 30 Jun 2004 22:53:03 -0000
@@ -472,7 +472,6 @@
  package MY;

  use Config;
-use File::Spec::Functions qw(catdir);
  use constant WIN32 => $^O eq 'MSWin32';

  my $apache_test_install;
@@ -489,7 +488,7 @@
      if (WIN32) {
          ModPerl::MM::add_dep(\$string, pure_all => 'aprext');

-        my $aprext = catdir qw(xs APR aprext);
+        my $aprext = File::Spec->catdir(qw(xs APR aprext));
          $string .= <<"EOF";

  aprext:

Apparently MakeMaker in 5.6.x was a bit broken...

-- 
__________________________________________________________________
Stas Bekman            JAm_pH ------> Just Another mod_perl Hacker
http://stason.org/     mod_perl Guide ---> http://perl.apache.org
mailto:stas@stason.org http://use.perl.org http://apacheweek.com
http://modperlbook.org http://apache.org   http://ticketmaster.com

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@perl.apache.org
For additional commands, e-mail: dev-help@perl.apache.org