Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

map i386 to x86_64 when making urls of skaji-relocatable-perl #826

Merged
merged 4 commits into from
Nov 15, 2024
Merged

map i386 to x86_64 when making urls of skaji-relocatable-perl #826

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
86784c4
map i386 to x86_64 when making urls of skaji-relocatable-perl
gugod Nov 15, 2024
2a341e1
rebuild
gugod Nov 15, 2024
3913964
mark i386 as being compatible with amd64.
gugod Nov 15, 2024
692f344
rebuild
gugod Nov 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions lib/App/Perlbrew/Util.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand All @@ -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";
}
Expand Down
5 changes: 3 additions & 2 deletions perlbrew
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand All @@ -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";
}
Expand Down
Loading