macos-cross-rpi-perl-patch-fix.patch

diff --git a/pkgs/development/interpreters/perl/no-sys-dirs-5.31.patch b/pkgs/development/interpreters/perl/no-sys-dirs-5.31.patch
index 62dce0e25b9..7a8de4f427f 100644
--- a/pkgs/development/interpreters/perl/no-sys-dirs-5.31.patch
+++ b/pkgs/development/interpreters/perl/no-sys-dirs-5.31.patch
@@ -1,7 +1,7 @@
-diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/Configure perl-5.20.0/Configure
---- perl-5.20.0-orig/Configure	2014-05-26 15:34:18.000000000 +0200
-+++ perl-5.20.0/Configure	2014-06-25 10:43:35.368285986 +0200
-@@ -106,15 +106,7 @@
+diff --color -ur a/Configure b/Configure
+--- a/Configure	2020-06-15 01:01:24.000000000 +0200
++++ b/Configure	2021-02-24 12:37:10.860105159 +0100
+@@ -108,15 +108,7 @@
  fi
  
  : Proper PATH setting
@@ -18,8 +18,8 @@ diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/Configure perl-5.20.0/Configure
  
  for p in $paths
  do
-@@ -1337,8 +1329,7 @@
- archname=''
+@@ -1435,8 +1427,7 @@
+ i_whoami=''
  : Possible local include directories to search.
  : Set locincpth to "" in a hint file to defeat local include searches.
 -locincpth="/usr/local/include /opt/local/include /usr/gnu/include"
@@ -28,8 +28,8 @@ diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/Configure perl-5.20.0/Configure
  :
  : no include file wanted by default
  inclwanted=''
-@@ -1349,17 +1340,12 @@
- 
+@@ -1450,17 +1441,12 @@
+ archobjs=''
  libnames=''
  : change the next line if compiling for Xenix/286 on Xenix/386
 -xlibpth='/usr/lib/386 /lib/386'
@@ -49,8 +49,8 @@ diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/Configure perl-5.20.0/Configure
  
  : Private path used by Configure to find libraries.  Its value
  : is prepended to libpth. This variable takes care of special
-@@ -1391,8 +1377,6 @@
- libswanted="$libswanted m crypt sec util c cposix posix ucb bsd BSD"
+@@ -1495,8 +1481,6 @@
+ libswanted="$libswanted sun m crypt sec util c cposix posix ucb bsd BSD"
  : We probably want to search /usr/shlib before most other libraries.
  : This is only used by the lib/ExtUtils/MakeMaker.pm routine extliblist.
 -glibpth=`echo " $glibpth " | sed -e 's! /usr/shlib ! !'`
@@ -58,7 +58,7 @@ diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/Configure perl-5.20.0/Configure
  : Do not use vfork unless overridden by a hint file.
  usevfork=false
  
-@@ -2446,7 +2430,6 @@
+@@ -2553,7 +2537,6 @@
  zip
  "
  pth=`echo $PATH | sed -e "s/$p_/ /g"`
@@ -66,7 +66,7 @@ diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/Configure perl-5.20.0/Configure
  for file in $loclist; do
  	eval xxx=\$$file
  	case "$xxx" in
-@@ -4936,7 +4919,7 @@
+@@ -5049,7 +5032,7 @@
  : Set private lib path
  case "$plibpth" in
  '') if ./mips; then
@@ -75,7 +75,7 @@ diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/Configure perl-5.20.0/Configure
      fi;;
  esac
  case "$libpth" in
-@@ -8600,13 +8583,8 @@
+@@ -8877,13 +8860,8 @@
  echo " "
  case "$sysman" in
  '')
@@ -91,7 +91,7 @@ diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/Configure perl-5.20.0/Configure
  	;;
  esac
  if $test -d "$sysman"; then
-@@ -19900,9 +19878,10 @@
+@@ -21027,9 +21005,10 @@
  case "$full_ar" in
  '') full_ar=$ar ;;
  esac
@@ -103,11 +103,11 @@ diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/Configure perl-5.20.0/Configure
  
  : see what type gids are declared as in the kernel
  echo " "
-Only in perl-5.20.0/: Configure.orig
-diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/ext/Errno/Errno_pm.PL perl-5.20.0/ext/Errno/Errno_pm.PL
---- perl-5.20.0-orig/ext/Errno/Errno_pm.PL	2014-05-26 15:34:20.000000000 +0200
-+++ perl-5.20.0/ext/Errno/Errno_pm.PL	2014-06-25 10:31:24.317970047 +0200
-@@ -134,12 +126,7 @@
+Seulement dans b: Configure.orig
+diff --color -ur a/ext/Errno/Errno_pm.PL b/ext/Errno/Errno_pm.PL
+--- a/ext/Errno/Errno_pm.PL	2020-06-15 01:01:25.000000000 +0200
++++ b/ext/Errno/Errno_pm.PL	2021-02-24 12:37:10.861105201 +0100
+@@ -134,12 +134,7 @@
  	if ($dep =~ /(\S+errno\.h)/) {
  	     $file{$1} = 1;
  	}
@@ -118,14 +118,13 @@ diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/ext/Errno/Errno_pm.PL perl-5.20.0/e
 -	      $linux_errno_h
 -	     ) {
 +    } elsif (0) {
-	$file{$linux_errno_h} = 1;
+ 	$file{$linux_errno_h} = 1;
      } elsif ($^O eq 'haiku') {
-	# hidden in a special place
-Only in perl-5.20.0/ext/Errno: Errno_pm.PL.orig
-diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/hints/freebsd.sh perl-5.20.0/hints/freebsd.sh
---- perl-5.20.0-orig/hints/freebsd.sh	2014-01-31 22:55:51.000000000 +0100
-+++ perl-5.20.0/hints/freebsd.sh	2014-06-25 10:25:53.263964680 +0200
-@@ -119,21 +119,21 @@
+ 	# hidden in a special place
+diff --color -ur a/hints/freebsd.sh b/hints/freebsd.sh
+--- a/hints/freebsd.sh	2020-06-15 01:01:25.000000000 +0200
++++ b/hints/freebsd.sh	2021-02-24 12:37:10.861105201 +0100
+@@ -127,21 +127,21 @@
          objformat=`/usr/bin/objformat`
          if [ x$objformat = xaout ]; then
              if [ -e /usr/lib/aout ]; then
@@ -153,10 +152,11 @@ diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/hints/freebsd.sh perl-5.20.0/hints/
         ldflags="-Wl,-E "
          lddlflags="-shared "
          cccdlflags='-DPIC -fPIC'
-diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/hints/linux.sh perl-5.20.0/hints/linux.sh
---- perl-5.20.0-orig/hints/linux.sh	2014-05-26 15:34:20.000000000 +0200
-+++ perl-5.20.0/hints/linux.sh	2014-06-25 10:33:47.354883843 +0200
-@@ -150,28 +150,6 @@ case "$optimize" in
+Seulement dans b/hints: freebsd.sh.orig
+diff --color -ur a/hints/linux.sh b/hints/linux.sh
+--- a/hints/linux.sh	2020-06-15 01:01:25.000000000 +0200
++++ b/hints/linux.sh	2021-02-24 12:37:10.863105283 +0100
+@@ -150,28 +150,6 @@
      ;;
  esac
  
@@ -185,7 +185,7 @@ diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/hints/linux.sh perl-5.20.0/hints/li
  case "$plibpth" in
  '') plibpth=`LANG=C LC_ALL=C $gcc $ccflags $ldflags -print-search-dirs | grep libraries |
  	cut -f2- -d= | tr ':' $trnl | grep -v 'gcc' | sed -e 's:/$::'`
-@@ -208,32 +186,6 @@ case "$usequadmath" in
+@@ -208,32 +186,6 @@
    ;;
  esac
  
@@ -218,7 +218,7 @@ diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/hints/linux.sh perl-5.20.0/hints/li
  if ${sh:-/bin/sh} -c exit; then
    echo ''
    echo 'You appear to have a working bash.  Good.'
-@@ -311,33 +263,6 @@ sparc*)
+@@ -311,33 +263,6 @@
  	;;
  esac