fix DynaLoader test, start on File::ShareDir for loading patches

Author: G4Vi

Makefile.PL

@@ -2,6 +2,9 @@ use 5.010;
 use strict;
 use warnings;
 use ExtUtils::MakeMaker;
+use File::ShareDir::Install;
+
+install_share 'share';
 
 my %WriteMakefileArgs = (
     NAME             => 'Perl::Dist::APPerl',
@@ -12,11 +15,13 @@ my %WriteMakefileArgs = (
     MIN_PERL_VERSION => '5.010',
     CONFIGURE_REQUIRES => {
         'ExtUtils::MakeMaker' => '0',
+        "File::ShareDir::Install" => "0.13"
     },
     PREREQ_PM => {
         'JSON::PP'   => '2.0104',
         'File::Path' => '2.07',
         'version'    => '0.77',
+        "File::ShareDir" => 0,
     },
     TEST_REQUIRES => {
         'Test::Pod::LinkCheck::Lite' => '0',
@@ -73,3 +78,9 @@ sub MY::postamble {
     return "authortest: test\n\tAUTHOR_TESTING=1 "
       . $_[0]->test_via_harness( '$(FULLPERLRUN)', 'xt/author/*.t' );
 }
+
+{
+package
+MY;
+use File::ShareDir::Install qw(postamble);
+}

lib/Perl/Dist/APPerl.pm

@@ -710,14 +710,15 @@ my %defconfig = (
             desc => "For developing cosmo platform perl without apperl additions",
             base => 'full',
             perl_id => 'cosmo',
-            patches => ['../Perl-Dist-APPerl/5.36-cosmo.patch']
+            patches => ['../Perl-Dist-APPerl/share/5.36-cosmo.patch']
         },
         perl_cosmo3_dev => {
             desc => "For developing cosmo platform perl without apperl additions",
             base => 'full',
             perl_id => 'v5.36.3',
             perl_url => undef,
-            patches => ['../Perl-Dist-APPerl/5.36-cosmo3.patch']
+            patches => ['../Perl-Dist-APPerl/share/5.36-cosmo3.patch'],
+            install_modules => ['File-ShareDir-1.118.tar.gz']
         },
         perl_cosmo_dev_on_vista => {
             desc => "For developing cosmo platform perl without apperl additions on vista",
@@ -1132,7 +1133,9 @@ sub Build {
         my $perllib = "$TEMPDIR$proxyConfig{installprivlib}";
         my $perlarchlib = "$TEMPDIR$proxyConfig{installarchlib}";
         my $mmopt = sub {
-            my @mmopt = ("PERL_LIB=$perllib", "PERL_ARCHLIB=$perlarchlib", "MAP_TARGET=perl.com.dbg",
+            my @mmopt = ("PERL_LIB=$perllib", "PERL_ARCHLIB=$perlarchlib",
+                #"MAP_TARGET=perl.com.dbg",
+                "MAP_TARGET=perl.com",
                 "INSTALLDIRS=perl",
                 "INSTALLARCHLIB=$perlarchlib",
                 "INSTALLPRIVLIB=$perllib",
@@ -1198,8 +1201,9 @@ sub Build {
                 # install into the src tree
                 _command_or_die('make', 'install');
                 # build a new perl binary, convert to APE, and repack zip
-                _command_or_die('make', 'perl.com.dbg');
-                _command_or_die(dirname($proxyConfig{cc})."/x86_64-linux-musl-objcopy", '-S', '-O', 'binary', 'perl.com.dbg', 'perl.com');
+                #_command_or_die('make', 'perl.com.dbg');
+                #_command_or_die(dirname($proxyConfig{cc})."/x86_64-linux-musl-objcopy", '-S', '-O', 'binary', 'perl.com.dbg', 'perl.com');
+                _command_or_die('make', 'perl.com');
                 $PERL_APE = abs_path('./perl.com');
             }
             else {
@@ -1503,14 +1507,23 @@ sub _load_apperl_config {
         defined($thispath) or die(__FILE__.'issues?');
         push @{$itemconfig{zip_extra_files}{"__perllib__/Perl/Dist"}}, $thispath;
         my $apperlm = $0;
+        my $patchdir;
         if(basename($0) ne 'apperlm') {
             $apperlm = dirname($thispath)."/../../../script/apperlm";
         }
+        $patchdir = dirname($thispath)."/../../../share";
         $apperlm = abs_path($apperlm);
         defined($apperlm) or die "error getting path to apperlm";
         my @additionalfiles = ($apperlm);
         -e $_ or die("$_ $!") foreach @additionalfiles;
         push @{$itemconfig{zip_extra_files}{bin}}, @additionalfiles;
+        $patchdir = abs_path($patchdir);
+        defined($patchdir) or die "error getting path to patchdir";
+        opendir(my $dh, $patchdir) or die "error opening patch dir";
+        while(my $file = readdir $dh) {
+            next if(($file eq '.') || ($file eq '..'));
+            push @{$itemconfig{zip_extra_files}{"__perllib__/auto/share/dist/Perl-Dist-APPerl"}}, "$patchdir/$file";
+        }
     }
 
     # verify apperl config sanity

5.36-cosmo-apperl.patch renamed to share/5.36-cosmo-apperl.patch

@@ -523,6 +523,19 @@ index f0d451af3c..63dce797fa 100644
              PERL_FPU_POST_EXEC
              S_exec_failed(aTHX_ PL_sh_path, fd, do_report);
              goto leave;
+diff --git a/ext/DynaLoader/t/DynaLoader.t b/ext/DynaLoader/t/DynaLoader.t
+index 11b37b5c4e..7cd7769d38 100644
+--- a/ext/DynaLoader/t/DynaLoader.t
++++ b/ext/DynaLoader/t/DynaLoader.t
+@@ -119,7 +119,7 @@ SKIP: {
+     # (not at least by that name) that the dl_findfile()
+     # could find.
+     skip( "dl_findfile test not appropriate on $^O", 1 )
+-	if $^O =~ /(win32|vms|openbsd|bitrig|cygwin|vos|os390)/i;
++	if $^O =~ /(win32|vms|openbsd|bitrig|cygwin|vos|os390|cosmo)/i;
+     # Play safe and only try this test if this system
+     # looks pretty much Unix-like.
+     skip( "dl_findfile test not appropriate on $^O", 1 )
 diff --git a/ext/Errno/Errno_pm.PL b/ext/Errno/Errno_pm.PL
 index ee2f4a3a92..e5902fa53c 100644
 --- a/ext/Errno/Errno_pm.PL