You are viewing a plain text version of this content. The canonical link for it is here.
Posted to apreq-cvs@httpd.apache.org by jo...@apache.org on 2003/10/30 02:22:00 UTC
cvs commit: httpd-apreq-2/glue/perl Makefile.PL
joes 2003/10/29 17:22:00
Modified: build xsbuilder.pl
glue/perl Makefile.PL
Log:
Fix dynaloader version mismatch by overriding ExtUtils::XSBuilder::WrapXS::pm_text
Revision Changes Path
1.17 +30 -1 httpd-apreq-2/build/xsbuilder.pl
Index: xsbuilder.pl
===================================================================
RCS file: /home/cvs/httpd-apreq-2/build/xsbuilder.pl,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- xsbuilder.pl 29 Oct 2003 17:58:00 -0000 1.16
+++ xsbuilder.pl 30 Oct 2003 01:22:00 -0000 1.17
@@ -186,7 +186,7 @@
package My::WrapXS;
pop @dirs; # drop mod_h directories- WrapXS takes care of those
use base qw/ExtUtils::XSBuilder::WrapXS/;
-our $VERSION = '0.1';
+our $VERSION = $version;
__PACKAGE__ -> $_ for @ARGV;
sub parsesource_objects {[My::ParseSource->new]}
@@ -217,6 +217,35 @@
while (<$pod>) {
print $fh $_;
}
+}
+sub pm_text {
+ my($self, $module, $isa, $code) = @_;
+
+ return <<EOF;
+$self->{noedit_warning_hash}
+
+package $module;
+require DynaLoader ;
+use strict ;
+use vars qw{\$VERSION \@ISA} ;
+$isa
+push \@ISA, 'DynaLoader' ;
+\$VERSION = '$version';
+bootstrap $module \$VERSION ;
+
+# XXX How do we test for the appropriate modperl version?
+# The modperl package isn't necessarily loaded, but Apache2
+# is. Perhaps Apache2 should always include a VERSION?
+
+die __PACKAGE__ . ": httpd must load mod_apreq.so first"
+ if __PACKAGE__->env ne "Apache::RequestRec";
+
+$code
+
+1;
+__END__
+EOF
+
}
sub makefilepl_text {
my($self, $class, $deps,$typemap) = @_;
1.9 +0 -1 httpd-apreq-2/glue/perl/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /home/cvs/httpd-apreq-2/glue/perl/Makefile.PL,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Makefile.PL 28 Oct 2003 14:00:06 -0000 1.8
+++ Makefile.PL 30 Oct 2003 01:22:00 -0000 1.9
@@ -30,7 +30,6 @@
ModPerl::MM::WriteMakefile(
NAME => 'libapreq2',
- VERSION => '0.1',
DIR => [qw(xs)],
clean => { FILES => "xs t/logs t/TEST @scripts" },
realclean => { FILES => "xsbuilder/tables" },