a16f8d284e
update to 6.64 OBS-URL: https://build.opensuse.org/request/show/149956 OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/perl-ExtUtils-MakeMaker?expand=0&rev=17
94 lines
3.0 KiB
Diff
94 lines
3.0 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
|
|
|
|
@@ -70,9 +69,6 @@ if( $BUILDING_AS_PACKAGE ) {
|
|
|
|
$Extra_Prereqs{'JSON::PP::Compat5006'} = '1.09' if $] < 5.008;
|
|
}
|
|
-else {
|
|
- my::bundles::copy_bundles("bundled", "inc");
|
|
-}
|
|
|
|
# Test::Harnesses prior to 2.00 shoved all of @INC onto the command line
|
|
# when a test had -T. This made it too long. So we need a Test::Harness
|
|
@@ -99,7 +95,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,34 +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/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-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
|