Merge pull request #826 from gugod/arch-munge

map i386 to x86_64 when making urls of skaji-relocatable-perl
gugod · Nov 15, 2024 · b0baf72 · b0baf72
2 parents 114437a + 692f344
commit b0baf72
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/lib/App/Perlbrew/Util.pm b/lib/App/Perlbrew/Util.pm
@@ -123,7 +123,8 @@ sub looks_like_url_of_skaji_relocatable_perl  {
 sub _arch_compat {
     my ($arch) = @_;
     my $compat = {
-        x86_64 => "amd64"
+        x86_64 => "amd64",
+        i386   => "amd64",
     };
     return $compat->{$arch} || $arch;
 }
@@ -143,7 +144,7 @@ sub make_skaji_relocatable_perl_url {
         my $version = $1;
         my $os = $sys->os;
         my $arch = $sys->arch;
-        $arch = "amd64" if $arch eq 'x86_64';
+        $arch = "amd64" if $arch eq 'x86_64' || $arch eq 'i386';
 
         return "https://github.com/skaji/relocatable-perl/releases/download/$version/perl-$os-$arch.tar.gz";
     }

diff --git a/perlbrew b/perlbrew
@@ -540,7 +540,8 @@ $fatpacked{"App/Perlbrew/Util.pm"} = '#line '.(1+__LINE__).' "'.__FILE__."\"\n".
   sub _arch_compat {
       my ($arch) = @_;
       my $compat = {
-          x86_64 => "amd64"
+          x86_64 => "amd64",
+          i386   => "amd64",
       };
       return $compat->{$arch} || $arch;
   }
@@ -560,7 +561,7 @@ $fatpacked{"App/Perlbrew/Util.pm"} = '#line '.(1+__LINE__).' "'.__FILE__."\"\n".
           my $version = $1;
           my $os = $sys->os;
           my $arch = $sys->arch;
-          $arch = "amd64" if $arch eq 'x86_64';
+          $arch = "amd64" if $arch eq 'x86_64' || $arch eq 'i386';
   
           return "https://github.com/skaji/relocatable-perl/releases/download/$version/perl-$os-$arch.tar.gz";
       }