| 1 |
idl0r 12/06/06 18:22:02 |
| 2 |
|
| 3 |
Added: mod_perl-2.0.7-bundled-Apache-Test.patch |
| 4 |
Log: |
| 5 |
Version bump, bug 419839 |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha110/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 www-apache/mod_perl/files/mod_perl-2.0.7-bundled-Apache-Test.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apache/mod_perl/files/mod_perl-2.0.7-bundled-Apache-Test.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apache/mod_perl/files/mod_perl-2.0.7-bundled-Apache-Test.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: mod_perl-2.0.7-bundled-Apache-Test.patch |
| 16 |
=================================================================== |
| 17 |
diff --git a/Makefile.PL b/Makefile.PL |
| 18 |
index c4a0430..e85cf01 100644 |
| 19 |
--- a/Makefile.PL |
| 20 |
+++ b/Makefile.PL |
| 21 |
@@ -24,7 +24,7 @@ BEGIN { |
| 22 |
|
| 23 |
} |
| 24 |
|
| 25 |
-use lib qw(lib Apache-Test/lib); |
| 26 |
+use lib qw(lib); |
| 27 |
|
| 28 |
use Config; |
| 29 |
use File::Spec::Functions; |
| 30 |
@@ -117,16 +117,6 @@ sub get_DEFINE { |
| 31 |
} |
| 32 |
|
| 33 |
sub configure { |
| 34 |
- |
| 35 |
- # mod_perl test suite relies on having Apache-Test bundled with |
| 36 |
- # the mod_perl source, since any pre-installed version may not do |
| 37 |
- # the right thing |
| 38 |
- unless (-d "Apache-Test") { |
| 39 |
- error "Can't find a sub-directory Apache-Test. " . |
| 40 |
- "Make sure that you are using a complete source distribution"; |
| 41 |
- exit 1; |
| 42 |
- } |
| 43 |
- |
| 44 |
set_modperl_version(); |
| 45 |
|
| 46 |
if ($old_modperl_version) { |
| 47 |
@@ -798,14 +788,9 @@ run_tests : test_clean |
| 48 |
run_subtests :: |
| 49 |
cd ModPerl-Registry && $(MAKE) test |
| 50 |
|
| 51 |
-run_subtests :: |
| 52 |
- cd Apache-Reload && $(MAKE) test |
| 53 |
- |
| 54 |
EOF |
| 55 |
|
| 56 |
$preamble .= <<'EOF' unless $build->mpm_is_threaded(); |
| 57 |
-run_subtests :: |
| 58 |
- cd Apache-SizeLimit && $(MAKE) test |
| 59 |
|
| 60 |
EOF |
| 61 |
|
| 62 |
@@ -816,36 +801,6 @@ EOF |
| 63 |
return $preamble; |
| 64 |
} |
| 65 |
|
| 66 |
-sub MY::postamble { |
| 67 |
- my $self = shift; |
| 68 |
- |
| 69 |
- my $string = $self->ModPerl::BuildMM::MY::postamble; |
| 70 |
- |
| 71 |
- $string .= <<'EOF'; |
| 72 |
-mydist : Apache-Test/META.yml mod_perl.spec manifest tardist |
| 73 |
- |
| 74 |
-rpm: dist |
| 75 |
- @[ -d $(PWD)/rpm ] || mkdir $(PWD)/rpm |
| 76 |
- rpmbuild -ta --define "_rpmdir $(PWD)/rpm" \ |
| 77 |
- --define "_srcrpmdir $(PWD)/rpm" \ |
| 78 |
- $(DISTVNAME).tar.gz |
| 79 |
- @mv $(PWD)/rpm/*/*.rpm $(PWD)/rpm/ |
| 80 |
- @rm -rf $(PWD)/rpm/*/ |
| 81 |
- |
| 82 |
-mod_perl.spec: build/make_rpm_spec |
| 83 |
- $(PERL) build/make_rpm_spec |
| 84 |
- |
| 85 |
-Apache-Test/META.yml: |
| 86 |
- cd Apache-Test && make metafile |
| 87 |
- |
| 88 |
-tag : |
| 89 |
- svn copy https://svn.apache.org/repos/asf/perl/modperl/branches/release/$(VERSION_SYM) https://svn.apache.org/repos/asf/perl/modperl/tags/$(VERSION_SYM) |
| 90 |
- svn copy https://svn.apache.org/repos/asf/perl/modperl/docs/trunk https://svn.apache.org/repos/asf/perl/modperl/docs/tags/$(VERSION_SYM) |
| 91 |
-EOF |
| 92 |
- |
| 93 |
- return $string; |
| 94 |
-} |
| 95 |
- |
| 96 |
# this is a workaround so that ModPerl::MM will move MY::constants |
| 97 |
# away, and Apache-Test/Makefile.PL which has its own MY::constants |
| 98 |
# won't get complaints on MY::constants redefined |
| 99 |
diff --git a/ModPerl-Registry/Makefile.PL b/ModPerl-Registry/Makefile.PL |
| 100 |
index e72e65c..8610935 100644 |
| 101 |
--- a/ModPerl-Registry/Makefile.PL |
| 102 |
+++ b/ModPerl-Registry/Makefile.PL |
| 103 |
@@ -14,7 +14,7 @@ use Apache::TestMM qw(test clean); |
| 104 |
|
| 105 |
# prerequisites |
| 106 |
my %require = ( |
| 107 |
- "Apache::Test" => "", # any version will do? |
| 108 |
+ "Apache::Test" => 0, # any version will do? |
| 109 |
); |
| 110 |
|
| 111 |
my @scripts = qw(t/TEST t/SMOKE); |
| 112 |
diff --git a/lib/ModPerl/BuildMM.pm b/lib/ModPerl/BuildMM.pm |
| 113 |
index 1c729e2..8651999 100644 |
| 114 |
--- a/lib/ModPerl/BuildMM.pm |
| 115 |
+++ b/lib/ModPerl/BuildMM.pm |
| 116 |
@@ -38,12 +38,10 @@ my @methods = grep *{$stash->{$_}}{CODE}, keys %$stash; |
| 117 |
ModPerl::MM::override_eu_mm_mv_all_methods(@methods); |
| 118 |
use strict 'refs'; |
| 119 |
|
| 120 |
-my $apache_test_dir = catdir Cwd::getcwd(), "Apache-Test", "lib"; |
| 121 |
- |
| 122 |
#to override MakeMaker MOD_INSTALL macro |
| 123 |
sub mod_install { |
| 124 |
q{$(PERL) -I$(INST_LIB) -I$(PERL_LIB) \\}."\n" . |
| 125 |
- qq{-I$apache_test_dir -MModPerl::BuildMM \\}."\n" . |
| 126 |
+ qq{-MModPerl::BuildMM \\}."\n" . |
| 127 |
q{-e "ExtUtils::Install::install({@ARGV},'$(VERBINST)',0,'$(UNINST)');"}."\n"; |
| 128 |
} |
| 129 |
|
| 130 |
@@ -269,7 +267,7 @@ sub ModPerl::BuildMM::MY::postamble { |
| 131 |
|
| 132 |
push @target, |
| 133 |
'$(FULLPERL) -I$(INST_LIB) ' . |
| 134 |
- "-I$apache_test_dir -MModPerl::BuildMM " . |
| 135 |
+ "-MModPerl::BuildMM " . |
| 136 |
"-e ModPerl::BuildMM::glue_pod $pm $podpath $blib"; |
| 137 |
|
| 138 |
# Win32 doesn't normally install man pages |
| 139 |
diff --git a/lib/ModPerl/Manifest.pm b/lib/ModPerl/Manifest.pm |
| 140 |
index 1e856bc..9f1833c 100644 |
| 141 |
--- a/lib/ModPerl/Manifest.pm |
| 142 |
+++ b/lib/ModPerl/Manifest.pm |
| 143 |
@@ -33,7 +33,6 @@ our @EXPORT_OK = qw(mkmanifest); |
| 144 |
my @add_files = qw{ |
| 145 |
MANIFEST |
| 146 |
mod_perl.spec |
| 147 |
- Apache-Test/META.yml |
| 148 |
}; |
| 149 |
|
| 150 |
sub get_svn_files { |
Archives