perl-ExtUtils-MakeMaker/fix-provides.diff

92 lines
3.4 KiB
Diff

Index: ExtUtils-MakeMaker-6.62/blib/lib/ExtUtils/Mkbootstrap.pm
===================================================================
--- ExtUtils-MakeMaker-6.62.orig/lib/ExtUtils/Mkbootstrap.pm 2011-10-24 01:44:11.000000000 +0200
+++ ExtUtils-MakeMaker-6.62/lib/ExtUtils/Mkbootstrap.pm 2012-02-16 13:29:03.374818889 +0100
@@ -31,7 +31,8 @@ sub Mkbootstrap {
if (-f "${baseext}_BS"){
$_ = "${baseext}_BS";
- package DynaLoader; # execute code as if in DynaLoader
+ package
+ DynaLoader; # execute code as if in DynaLoader
local($osname, $dlsrc) = (); # avoid warnings
($osname, $dlsrc) = @Config::Config{qw(osname dlsrc)};
$bscode = "";
@@ -41,7 +42,8 @@ sub Mkbootstrap {
}
if ($Config{'dlsrc'} =~ /^dl_dld/){
- package DynaLoader;
+ package
+ DynaLoader;
push(@dl_resolve_using, dl_findfile('-lc'));
}
Index: ExtUtils-MakeMaker-6.62/Makefile.PL
===================================================================
--- ExtUtils-MakeMaker-6.62.orig/Makefile.PL 2011-09-25 07:17:37.000000000 +0200
+++ ExtUtils-MakeMaker-6.62/Makefile.PL 2012-02-16 13:23:46.951720554 +0100
@@ -11,7 +11,6 @@ BEGIN { require 5.006; }
use strict;
use lib ".";
-use my::bundles; # Must be used before anything else to set up bundled dependencies
use lib qw(lib); # build ourself with ourself
@@ -51,8 +50,6 @@ $prereq{'Test::Harness'} = 2.00 if $^O e
check_environment();
-my::bundles::copy_bundles("bundled", "inc");
-
my $MM = WriteMakefile(
NAME => $PACKAGE,
VERSION_FROM => "lib/$PACKAGE_FILE.pm", # finds $VERSION
@@ -73,7 +70,6 @@ my $MM = WriteMakefile(
META_MERGE => {
no_index => {
package => [ 'DynaLoader', 'in' ], # "in" is a PAUSE misparse.
- directory => [ 'bundled', 'my' ],
},
resources => {
license => 'http://dev.perl.org/licenses/',
Index: ExtUtils-MakeMaker-6.62/MANIFEST
===================================================================
--- ExtUtils-MakeMaker-6.62.orig/MANIFEST 2011-10-24 01:47:10.000000000 +0200
+++ ExtUtils-MakeMaker-6.62/MANIFEST 2012-02-16 13:24:07.363759353 +0100
@@ -1,33 +1,4 @@
bin/instmodsh
-bundled/CPAN-Meta-YAML/CPAN/Meta/YAML.pm
-bundled/CPAN-Meta/CPAN/Meta.pm
-bundled/CPAN-Meta/CPAN/Meta/Converter.pm
-bundled/CPAN-Meta/CPAN/Meta/Feature.pm
-bundled/CPAN-Meta/CPAN/Meta/History.pm
-bundled/CPAN-Meta/CPAN/Meta/Prereqs.pm
-bundled/CPAN-Meta/CPAN/Meta/Spec.pm
-bundled/CPAN-Meta/CPAN/Meta/Validator.pm
-bundled/ExtUtils-Command/ExtUtils/Command.pm
-bundled/ExtUtils-Install/ExtUtils/Install.pm
-bundled/ExtUtils-Install/ExtUtils/Installed.pm
-bundled/ExtUtils-Install/ExtUtils/Packlist.pm
-bundled/ExtUtils-Manifest/ExtUtils/Manifest.pm
-bundled/ExtUtils-Manifest/ExtUtils/MANIFEST.SKIP
-bundled/File-Copy-Recursive/File/Copy/Recursive.pm
-bundled/File-Temp/File/Temp.pm
-bundled/JSON-PP-Compat5006/JSON/PP/Compat5006.pm
-bundled/JSON-PP/JSON/PP.pm
-bundled/JSON-PP/JSON/PP/Boolean.pm
-bundled/Parse-CPAN-Meta/Parse/CPAN/Meta.pm
-bundled/Scalar-List-Utils/List/Util.pm
-bundled/Scalar-List-Utils/List/Util/PP.pm
-bundled/Scalar-List-Utils/Scalar/Util.pm
-bundled/Scalar-List-Utils/Scalar/Util/PP.pm
-bundled/Version-Requirements/Version/Requirements.pm
-bundled/version/version.pm
-bundled/version/version.pod
-bundled/version/version/Internals.pod
-bundled/version/version/vpp.pm
Changes
INSTALL
lib/ExtUtils/Command/MM.pm