Skip to content

Commit e2d8465

Browse files
authored
1 parent 82bee8f commit e2d8465

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

build/lin.sh

+7-6
Original file line numberDiff line numberDiff line change
@@ -85,12 +85,6 @@ export CARGO_PROFILE_RELEASE_PANIC=abort
8585
# https://reproducible-builds.org/docs/build-path/
8686
export RUSTFLAGS+=" --remap-path-prefix=$CARGO_HOME/registry/="
8787

88-
# Ensure Cargo uses correct linker when cross-compiling
89-
if [ "$LINUX" = true ] && [ -n "$CHOST" ]; then
90-
echo "[target.${RUST_TARGET}]" >> "$CARGO_HOME/config"
91-
echo "linker = \"${CHOST}-gcc\"" >> "$CARGO_HOME/config"
92-
fi
93-
9488
# We don't want to use any native libraries, so unset PKG_CONFIG_PATH
9589
unset PKG_CONFIG_PATH
9690

@@ -427,6 +421,13 @@ sed -i'.bak' "/image = /s/, \"gif\", \"webp\"//" rsvg/Cargo.toml
427421
sed -i'.bak' "/cairo-rs = /s/, \"pdf\", \"ps\"//" {librsvg-c,rsvg}/Cargo.toml
428422
# Skip build of rsvg-convert
429423
sed -i'.bak' "/subdir('rsvg_convert')/d" meson.build
424+
# https://github.com/etemesi254/zune-image/pull/187
425+
# https://github.com/bevyengine/bevy/issues/14117#issuecomment-2236518551
426+
# https://doc.rust-lang.org/cargo/reference/overriding-dependencies.html#the-patch-section
427+
cat >> Cargo.toml <<EOL
428+
[patch.crates-io]
429+
zune-jpeg = { git = "https://github.com/ironpeak/zune-image.git", rev = "eebb01b" }
430+
EOL
430431
# Regenerate the lockfile after making the above changes
431432
cargo generate-lockfile
432433
# Remove the --static flag from the PKG_CONFIG env since Rust does not

0 commit comments

Comments
 (0)