Fix Rust pre commit #66
Conversation
m-iwanicki
left a comment
m-iwanicki
left a comment
There was a problem hiding this comment.
- Are you sure you don't need
inherit rust-target-config(you removed it in a lot of places) - Did you test it?
|
|
||
| } | ||
|
|
||
| addtask rust_create_wrappers before do_configure after do_patch do_prepare_recipe_sysroot |
| # Note that TUNE_FEATURES is _always_ refering to the target, so we really | ||
| # don't want to use this for the host/build. | ||
| llvm_features_from_tune[vardepvalue] = "${@llvm_features_from_tune(d)}" | ||
| # TARGET_CC_ARCH changes from build/cross/target so it'll do the right thing |
There was a problem hiding this comment.
Is this comment related to llvm_features_from_tune or llvm_features_from_cc_arch?
| fpu = d.getVar('TARGET_FPU') | ||
| return ["+soft-float"] if fpu == "soft" else [] | ||
|
|
||
| ## arm-unknown-linux-gnueabihf |
There was a problem hiding this comment.
Why did you move comment?
| # Convert a normal arch (HOST_ARCH, TARGET_ARCH, BUILD_ARCH, etc) to something | ||
| # rust's internals won't choke on. |
There was a problem hiding this comment.
This should probably be above arch_to_rust_target_arch
| addtask rust_gen_targets after do_patch before do_compile | ||
| addtask rust_gen_targets after do_patch before do_compile | ||
| addtask rust_gen_targets after do_patch before do_compile |
| RUSTLIB = "-L ${STAGING_DIR_HOST}${rustlibdir}" | ||
| RUST_DEBUG_REMAP = "--remap-path-prefix=${WORKDIR}=${TARGET_DBGSRC_DIR}" | ||
| RUSTFLAGS += "${RUSTLIB} ${RUST_DEBUG_REMAP}" | ||
| RUSTFLAGS:append = "${RUSTLIB} ${RUST_DEBUG_REMAP}" |
There was a problem hiding this comment.
-
Let's hope this recipe wasn't depending on how
+=works (if previouslyRUSTFLAGShad??=then+=would overwrite this value while append would add to??=(not sure about?=)) -
Suggested change
RUSTFLAGS += "${RUSTLIB} ${RUST_DEBUG_REMAP}" RUSTFLAGS:append = "${RUSTLIB} ${RUST_DEBUG_REMAP}" RUSTFLAGS += "${RUSTLIB} ${RUST_DEBUG_REMAP}" RUSTFLAGS:append = " ${RUSTLIB} ${RUST_DEBUG_REMAP}" Add space to the beginning when using
append
|
@m-iwanicki I jnow all the issues you outlined, this is the reason this PR is in draft state |
|
The problem that blocks this PR: ERROR: rust-native-1.83.0-r0 do_rust_create_wrappers: ExecutionError('/build/tmp/work/x86_64-linux/rust-native/1.83.0/temp/run.do_rust_create_wrappers.540', 2, None, None)
ERROR: Logfile of failure stored in: /build/tmp/work/x86_64-linux/rust-native/1.83.0/temp/log.do_rust_create_wrappers.540
Log data follows:
| DEBUG: Executing shell function do_rust_create_wrappers
| /build/tmp/work/x86_64-linux/rust-native/1.83.0/temp/run.do_rust_create_wrappers.540: 210: Syntax error: end of file unexpected (expecting "}")
| WARNING: exit code 2 from a shell command.
ERROR: Task (virtual:native:/build/../repo/meta-zarhus-distro/recipes-devtools/rust/rust_1.83.0.bb:do_rust_create_wrappers) failed with exit code '1' |
DaniilKl
force-pushed
the
fix-rust-pre-commit
branch
from
796a66c to
70b2399
Compare
Signed-off-by: Daniil Klimuk <daniil.klimuk@3mdeb.com>
We are using copied classes from other layers (e.g., Rust). These classes are used not onnly in our recipes but in several recipes in other layers. Hence, changing the names of these classes will ccause recipes in other layers to fail. Signed-off-by: Daniil Klimuk <daniil.klimuk@3mdeb.com>
DaniilKl
force-pushed
the
fix-rust-pre-commit
branch
from
70b2399 to
c305063
Compare
|
The problem might be with python/EOF. You changed tabs to spaces? Output: EOF prefixed with spaces doesn't work |
|
@DaniilKl, this change is already blocking some others. Could you address the review so we can merge this? Why is this in WIP? Also please consider splitting to just address #69 (comment) |
There is nothing to be splitted. This entire PR fixes on issue: the Rust classes not passing I will try to take a look tomorrow. |
Signed-off-by: Daniil Klimuk <daniil.klimuk@3mdeb.com>
|
The last commit seems to have broken smth.: logs. |
|
There is still a lot of unresolved comments. Maybe something to do with that? |
No description provided.