httpd-apreq-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Joe Schaefer <joe+gm...@sunstarsys.com>
Subject Re: 2.03-dev-rc1 available
Date Thu, 10 Jun 2004 19:15:10 GMT
Martin Nilsson <martin@gneto.com> writes:

[...]

> This would not be necessary if $Config{make] was gmake instead of
> make. This seems to be a problem with Apache::Test not libapreq!

Tough call, since Apache::Test is using the same "make" that
perl did.  Please try the following patch if possible (I think 
you need to run buildconf, or at least reconfigure with 
--enable-maintainer-mode).

Index: env/Makefile.am
===================================================================
RCS file: /home/cvs/httpd-apreq-2/env/Makefile.am,v
retrieving revision 1.19
diff -u -r1.19 Makefile.am
--- env/Makefile.am     28 Feb 2004 05:19:38 -0000      1.19
+++ env/Makefile.am     10 Jun 2004 19:08:52 -0000
@@ -40,7 +40,7 @@

 run_tests : t/TEST
        -cp -f test_cgi t/cgi-bin
-       @PERL@ t/TEST
+       MAKE=$(MAKE) @PERL@ t/TEST
 else

 run_tests:
@@ -51,7 +51,7 @@
 test :: all check run_tests

 test_clean : cmodules_clean
-       -@PERL@ t/TEST -clean
+       -MAKE=$(MAKE) @PERL@ t/TEST -clean
        -rm -rf t/htdocs t/logs t/modules t/TEST t/cgi-bin/test_cgi t/cgi-bin/.libs t/conf/extra.conf

 cmodules_clean:

Index: env/t/TEST.PL
===================================================================
RCS file: /home/cvs/httpd-apreq-2/env/t/TEST.PL,v
retrieving revision 1.7
diff -u -r1.7 TEST.PL
--- env/t/TEST.PL       27 Oct 2003 06:47:25 -0000      1.7
+++ env/t/TEST.PL       10 Jun 2004 19:08:53 -0000
@@ -39,6 +39,7 @@
 package My::TestConfig;
 use Apache::TestTrace;
 use Apache::TestConfigC;
+use Config;
 use Apache::Build;
 use constant WIN32 => Apache::Build::WIN32;

@@ -87,4 +88,24 @@
 EOF
     }
     close $fh or die "close $makefile: $!";
+}
+
+sub cmodules_makefile_vars {
+    my $make = $ENV{MAKE} || $Config{make};
+   return <<EOF; # XXX: do we need to propagate all the vars in config.nice?
+MAKE=$make
+EOF
+}
+
+sub cmodules_make {
+     my $self = shift;
+     my $targ = shift || 'all';
+     my $make = $ENV{MAKE} || $Config{make};
+
+     my $cmd = "cd $self->{cmodules_dir} && $make $targ";
+     debug $cmd;
+     system $cmd;
+     if ($?) {
+         die "Failed to build c-modules";
+       }
 }


-- 
Joe Schaefer


Mime
View raw message