Fix merge issues, remove excess files - match perl-5.30.1 dist

Timing is good deraadt@, OK sthen@

1 files changed, 7 insertions, 2 deletions

diff --git a/gnu/usr.bin/perl/ext/ExtUtils-Miniperl/lib/ExtUtils/Miniperl.pm b/gnu/usr.bin/perl/ext/ExtUtils-Miniperl/lib/ExtUtils/Miniperl.pm
index 6090970adc9..46af2a60739 100644
--- a/gnu/usr.bin/perl/ext/ExtUtils-Miniperl/lib/ExtUtils/Miniperl.pm
+++ b/gnu/usr.bin/perl/ext/ExtUtils-Miniperl/lib/ExtUtils/Miniperl.pm
@@ -6,7 +6,7 @@ use ExtUtils::Embed 1.31, qw(xsi_header xsi_protos xsi_body);
 
 our @ISA = qw(Exporter);
 our @EXPORT = qw(writemain);
-our $VERSION = '1.08';
+our $VERSION = '1.09';
 
 # blead will run this with miniperl, hence we can't use autodie or File::Temp
 my $temp;
@@ -63,7 +63,7 @@ sub writemain{
  *
  * The content of the body of this generated file is mostly contained
  * in Miniperl.pm - edit that file if you want to change anything.
- * miniperlmain.c is generated by running regen/miniperlmain.pl.pl, while
+ * miniperlmain.c is generated by running regen/miniperlmain.pl, while
  * perlmain.c is built automatically by Makefile (so the former is
  * included in the tarball while the latter isn't).
  */
@@ -78,6 +78,11 @@ sub writemain{
 #endif
 
 #define PERL_IN_MINIPERLMAIN_C
+
+/* work round bug in MakeMaker which doesn't currently (2019) supply this
+ * flag when making a statically linked perl */
+#define PERL_CORE 1
+
 %s
 static void xs_init (pTHX);
 static PerlInterpreter *my_perl;