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

feat: Add linux-ppc (PPC32 BE) build support to rattler #1024

Merged
merged 2 commits into from
Jan 11, 2025
Merged

feat: Add linux-ppc (PPC32 BE) build support to rattler #1024

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8f703b6
add linux-ppc support
hpckurt Jan 11, 2025
b025e3c
Run cargo fmt
wolfv Jan 11, 2025
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
14 changes: 14 additions & 0 deletions crates/rattler_conda_types/src/platform.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ pub enum Platform {
LinuxArmV7l,
LinuxPpc64le,
LinuxPpc64,
LinuxPpc,
LinuxS390X,
LinuxRiscv32,
LinuxRiscv64,
Expand Down Expand Up @@ -63,6 +64,7 @@ pub enum Arch {
ArmV7l,
Ppc64le,
Ppc64,
Ppc,
S390X,
Riscv32,
Riscv64,
Expand Down Expand Up @@ -99,6 +101,9 @@ impl Platform {
#[cfg(all(target_arch = "powerpc64", target_endian = "big"))]
return Platform::LinuxPpc64;

#[cfg(target_arch = "powerpc")]
return Platform::LinuxPpc;

#[cfg(target_arch = "s390x")]
return Platform::LinuxS390X;

Expand All @@ -116,6 +121,7 @@ impl Platform {
target_arch = "aarch64",
target_arch = "arm",
target_arch = "powerpc64",
target_arch = "powerpc",
target_arch = "s390x"
)))]
compile_error!("unsupported linux architecture");
Expand Down Expand Up @@ -198,6 +204,7 @@ impl Platform {
| Platform::LinuxArmV7l
| Platform::LinuxPpc64le
| Platform::LinuxPpc64
| Platform::LinuxPpc
| Platform::LinuxS390X
| Platform::LinuxRiscv32
| Platform::LinuxRiscv64
Expand All @@ -220,6 +227,7 @@ impl Platform {
| Platform::LinuxArmV7l
| Platform::LinuxPpc64le
| Platform::LinuxPpc64
| Platform::LinuxPpc
| Platform::LinuxS390X
| Platform::LinuxRiscv32
| Platform::LinuxRiscv64 => Some("linux"),
Expand Down Expand Up @@ -263,6 +271,7 @@ impl FromStr for Platform {
"linux-armv7l" => Platform::LinuxArmV7l,
"linux-ppc64le" => Platform::LinuxPpc64le,
"linux-ppc64" => Platform::LinuxPpc64,
"linux-ppc" => Platform::LinuxPpc,
"linux-s390x" => Platform::LinuxS390X,
"linux-riscv32" => Platform::LinuxRiscv32,
"linux-riscv64" => Platform::LinuxRiscv64,
Expand Down Expand Up @@ -294,6 +303,7 @@ impl From<Platform> for &'static str {
Platform::LinuxArmV7l => "linux-armv7l",
Platform::LinuxPpc64le => "linux-ppc64le",
Platform::LinuxPpc64 => "linux-ppc64",
Platform::LinuxPpc => "linux-ppc",
Platform::LinuxS390X => "linux-s390x",
Platform::LinuxRiscv32 => "linux-riscv32",
Platform::LinuxRiscv64 => "linux-riscv64",
Expand Down Expand Up @@ -321,6 +331,7 @@ impl Platform {
Platform::LinuxArmV7l => Some(Arch::ArmV7l),
Platform::LinuxPpc64le => Some(Arch::Ppc64le),
Platform::LinuxPpc64 => Some(Arch::Ppc64),
Platform::LinuxPpc => Some(Arch::Ppc),
Platform::LinuxS390X => Some(Arch::S390X),
Platform::LinuxRiscv32 => Some(Arch::Riscv32),
Platform::LinuxRiscv64 => Some(Arch::Riscv64),
Expand Down Expand Up @@ -394,6 +405,7 @@ impl FromStr for Arch {
"armv7l" => Arch::ArmV7l,
"ppc64le" => Arch::Ppc64le,
"ppc64" => Arch::Ppc64,
"ppc" => Arch::Ppc,
"s390x" => Arch::S390X,
"riscv32" => Arch::Riscv32,
"riscv64" => Arch::Riscv64,
Expand All @@ -419,6 +431,7 @@ impl From<Arch> for &'static str {
Arch::ArmV7l => "armv7l",
Arch::Ppc64le => "ppc64le",
Arch::Ppc64 => "ppc64",
Arch::Ppc => "ppc",
Arch::S390X => "s390x",
Arch::Riscv32 => "riscv32",
Arch::Riscv64 => "riscv64",
Expand Down Expand Up @@ -506,6 +519,7 @@ mod tests {
assert_eq!(Platform::LinuxArmV7l.arch(), Some(Arch::ArmV7l));
assert_eq!(Platform::LinuxPpc64le.arch(), Some(Arch::Ppc64le));
assert_eq!(Platform::LinuxPpc64.arch(), Some(Arch::Ppc64));
assert_eq!(Platform::LinuxPpc.arch(), Some(Arch::Ppc));
assert_eq!(Platform::LinuxS390X.arch(), Some(Arch::S390X));
assert_eq!(Platform::LinuxRiscv32.arch(), Some(Arch::Riscv32));
assert_eq!(Platform::LinuxRiscv64.arch(), Some(Arch::Riscv64));
Expand Down
1 change: 1 addition & 0 deletions crates/rattler_virtual_packages/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -519,6 +519,7 @@ impl Archspec {
Platform::LinuxAarch64 | Platform::LinuxArmV6l | Platform::LinuxArmV7l => "aarch64",
Platform::LinuxPpc64le => "ppc64le",
Platform::LinuxPpc64 => "ppc64",
Platform::LinuxPpc => "ppc",
Platform::LinuxS390X => "s390x",
Platform::LinuxRiscv32 => "riscv32",
Platform::LinuxRiscv64 => "riscv64",
Expand Down
Loading