|
|
Choosing A Webhost: |
Re: [mp2] recent 5.6.x breakage: msg#00185apache.mod-perl.devel
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@xxxxxxxxxx http://use.perl.org http://apacheweek.com http://modperlbook.org http://apache.org http://ticketmaster.com
|
|
| <Prev in Thread] | Current Thread | [Next in Thread> |
|---|---|---|
| Previous by Date: | Re: [mp2] recent 5.6.x breakage, Stas Bekman |
|---|---|
| Next by Date: | Re: [mp2] recent 5.6.x breakage, Stas Bekman |
| Previous by Thread: | Re: [mp2] recent 5.6.x breakage, Stas Bekman |
| Next by Thread: | Re: [mp2] recent 5.6.x breakage, Stas Bekman |
| Indexes: | [Date] [Thread] [Top] [All Lists] |
Free MagazinesCisco NewsReceive a free quarterly e-newsletter with exclusive articles on how Cisco IT uses its own products and solutions to enable the business. subscribe Systems Management News, the newspaper for IT systems administration and data center managers! Each issue of Systems Management News is chock-full of news and analysis to help you understand what's happening in your field. subscribe The Enterprise Newsweekly eWeek is the essential technology information source for builders of e-business. subscribe Oracle Magazine Oracle Magazine contains technology strategy articles, sample code, tips, Oracle and partner news, how to articles for developers and DBAs, and more. Oracle (NASDAQ: ORCL) is the world's largest enterprise software company. subscribe Total Telecom Total Telecom is "The Economist of the communications industry". subscribe |