patches for perl-5.37.11

arsv · Apr 21, 2023 · 8c2267c · 8c2267c
1 parent 4250554
commit 8c2267c
Show file tree

Hide file tree

Showing 10 changed files with 59 additions and 0 deletions.
diff --git a/cnf/diffs/perl5-5.37.11/constant.patch b/cnf/diffs/perl5-5.37.11/constant.patch
@@ -0,0 +1 @@
+../perl5-5.22.3/constant.patch
diff --git a/cnf/diffs/perl5-5.37.11/dynaloader.patch b/cnf/diffs/perl5-5.37.11/dynaloader.patch
@@ -0,0 +1 @@
+../perl5-5.22.3/dynaloader.patch
diff --git a/cnf/diffs/perl5-5.37.11/findext.patch b/cnf/diffs/perl5-5.37.11/findext.patch
@@ -0,0 +1 @@
+../perl5-5.22.3/findext.patch
diff --git a/cnf/diffs/perl5-5.37.11/installscripts.patch b/cnf/diffs/perl5-5.37.11/installscripts.patch
@@ -0,0 +1 @@
+../perl5-5.36.0/installscripts.patch
diff --git a/cnf/diffs/perl5-5.37.11/liblist.patch b/cnf/diffs/perl5-5.37.11/liblist.patch
@@ -0,0 +1 @@
+../perl5-5.37.8/liblist.patch
diff --git a/cnf/diffs/perl5-5.37.11/makemaker.patch b/cnf/diffs/perl5-5.37.11/makemaker.patch
@@ -0,0 +1,19 @@
+During the build, MakeMaker is run by miniperl, so $^O is the build
+platform; but for the code below, $Is{Android} means that the target
+platform is Android.
+
+Replacing $^O check altogether would probably be better,
+but there's already a double test like that, and it should be fixed
+upstream anyway.
+
+--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
++++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
+@@ -38,7 +38,7 @@
+     $Is{BSD}     = ($^O =~ /^(?:free|midnight|net|open)bsd$/ or
+                    grep( $^O eq $_, qw(bsdos interix dragonfly) )
+                   );
+-    $Is{Android} = $^O =~ /android/;
++    $Is{Android} = $^O =~ /android/ || $Config{osname} eq 'android';
+     if ( $^O eq 'darwin' ) {
+       my @osvers = split /\./, $Config{osvers};
+       if ( $^X eq '/usr/bin/perl' ) {
diff --git a/cnf/diffs/perl5-5.37.11/posix-makefile.patch b/cnf/diffs/perl5-5.37.11/posix-makefile.patch
@@ -0,0 +1 @@
+../perl5-5.22.3/posix-makefile.patch
diff --git a/cnf/diffs/perl5-5.37.11/test-checkcase.patch b/cnf/diffs/perl5-5.37.11/test-checkcase.patch
@@ -0,0 +1 @@
+../perl5-5.22.3/test-checkcase.patch
diff --git a/cnf/diffs/perl5-5.37.11/test-makemaker.patch b/cnf/diffs/perl5-5.37.11/test-makemaker.patch
@@ -0,0 +1 @@
+../perl5-5.34.0/test-makemaker.patch
diff --git a/cnf/diffs/perl5-5.37.11/xconfig.patch b/cnf/diffs/perl5-5.37.11/xconfig.patch
@@ -0,0 +1,32 @@
+perl-cross assumes the sources use xconfig.h with -DUSE_CROSS_COMPILE
+With perl 5.20.0, it's no longer true. Regardless of what mainline perl
+uses, let's stick with the old xconfig.h way for now.
+
+--- a/perl.h
++++ b/perl.h
+@@ -41,7 +41,11 @@
+ #ifdef PERL_MICRO
+ #   include "uconfig.h"
+ #else
++#   ifndef USE_CROSS_COMPILE
+ #   include "config.h"
++#   else
++#       include "xconfig.h"
++#   endif
+ #endif
+
+ /*
+--- a/perl_langinfo.h
++++ b/perl_langinfo.h
+@@ -4,7 +4,11 @@
+ #ifndef PERL_LANGINFO_H
+ #define PERL_LANGINFO_H 1
+
++#ifdef USE_CROSS_COMPILE
++#include "xconfig.h"
++#else
+ #include "config.h"
++#endif
+
+ #if defined(HAS_NL_LANGINFO) && defined(I_LANGINFO)
+ #   include <langinfo.h>