diff options
| -rw-r--r-- | games/veloren-weekly/Makefile | 7 | ||||
| -rw-r--r-- | games/veloren-weekly/files/patch-i386 | 28 |
2 files changed, 1 insertions, 34 deletions
diff --git a/games/veloren-weekly/Makefile b/games/veloren-weekly/Makefile index 005fd99c5bc6..6ebc608e7fc7 100644 --- a/games/veloren-weekly/Makefile +++ b/games/veloren-weekly/Makefile @@ -10,8 +10,7 @@ WWW= https://veloren.net/ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN_i386= https://github.com/bytecodealliance/wasmtime/issues/7924 -ONLY_FOR_ARCHS= aarch64 amd64 i386 +ONLY_FOR_ARCHS= aarch64 amd64 ONLY_FOR_ARCHS_REASON= unsupported platform by https://github.com/wasmerio/wasmer LIB_DEPENDS= libzstd.so:archivers/zstd \ @@ -36,10 +35,6 @@ PORTDATA= * CONFLICTS_INSTALL= ${PORTNAME} -.if ${MACHINE_ARCH} == i386 -# https://github.com/rust-lang/rust/issues/85598 -CARGO_ENV+= CARGO_PROFILE_RELEASE_LTO=false -.endif # Fixes error "Instruction does not dominate all uses!" WITHOUT_LTO= yes # XXX bug 277333 diff --git a/games/veloren-weekly/files/patch-i386 b/games/veloren-weekly/files/patch-i386 deleted file mode 100644 index 2dd39fcca4b6..000000000000 --- a/games/veloren-weekly/files/patch-i386 +++ /dev/null @@ -1,28 +0,0 @@ -https://gitlab.com/veloren/veloren/-/merge_requests/4103 - -error[E0308]: mismatched types - --> rtsim/src/gen/mod.rs:30:43 - | -30 | let mut rng = SmallRng::from_seed(seed); - | ------------------- ^^^^ expected an array with a fixed size of 16 elements, found one with 32 elements - | | - | arguments to this function are incorrect - | -note: associated function defined here - --> cargo-crates/rand_core-0.6.4/src/lib.rs:319:8 - | -319 | fn from_seed(seed: Self::Seed) -> Self; - | ^^^^^^^^^ - ---- rtsim/src/gen/mod.rs.orig 2023-07-03 10:21:20 UTC -+++ rtsim/src/gen/mod.rs -@@ -23,6 +23,9 @@ impl Data { - - impl Data { - pub fn generate(settings: &WorldSettings, world: &World, index: IndexRef) -> Self { -+#[cfg(target_pointer_width = "32")] -+ let mut seed = [0; 16]; -+#[cfg(not(target_pointer_width = "32"))] - let mut seed = [0; 32]; - seed.iter_mut() - .zip(&mut index.seed.to_le_bytes()) |