perl-ExtUtils-MakeMaker/fix-provides.diff
Stephan Kulow 48b67dc6cc - updated to 6.82
Misc:
   * Special-case the bundling of version, so
     that XS versions don't get overwritten
   Doc fixes:
   * Update XSPROTOARG docs for changes in xsubpp
   * Clarify heir-apparent in FAQ
   Misc:
   * Changed GNU-Style to Unix-Style
   * VMS will now report 'make' style
   * Updated bundled JSON::PP
   * Updated bundled Test-Simple
   Bug fixes:
   * Add CP_NONEMPTY to the list of tools in Makefile
   * don't copy .bs portably :)
   * RT#28992 don't copy .bs files if they are empty
   New feature:
   * Made UNINST an attribute, so removing shadowed modules
     can be set 'perl Makefile.PL UNINST=1'
   Bug fixes:
   * do not set default switches in Test::Harness; not even -w

OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/perl-ExtUtils-MakeMaker?expand=0&rev=18
2013-11-26 14:34:42 +00:00

94 lines
2.9 KiB
Diff

Index: lib/ExtUtils/Mkbootstrap.pm
===================================================================
--- lib/ExtUtils/Mkbootstrap.pm.orig
+++ lib/ExtUtils/Mkbootstrap.pm
@@ -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: Makefile.PL
===================================================================
--- Makefile.PL.orig
+++ Makefile.PL
@@ -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
@@ -80,8 +79,6 @@ else {
if ( $@ ) {
$Extra_Params{PERL} = "$^X -Iinc";
}
-
- my::bundles::copy_bundles("bundled", "inc");
}
# Test::Harnesses prior to 2.00 shoved all of @INC onto the command line
@@ -109,7 +106,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: MANIFEST
===================================================================
--- MANIFEST.orig
+++ MANIFEST
@@ -1,35 +1,5 @@
.perlcriticrc
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/Requirements.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/README
-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/version.pm
-bundled/version/version.pod
-bundled/version/version/Internals.pod
-bundled/version/version/vpp.pm
Changes
INSTALL
lib/ExtUtils/Command/MM.pm