| Message ID | 20250305060202.2477305-2-Deepesh.Varatharajan@windriver.com |
|---|---|
| State | Accepted, archived |
| Commit | d43424cba7e93ee30b410d0a024be441e2336dbd |
| Headers | show |
| Series | [V3,1/3] rust: Upgrade 1.82.0->1.83.0 | expand |
On Wed, 5 Mar 2025 at 07:02, Varatharajan, Deepesh via lists.openembedded.org <deepesh.varatharajan=windriver.com@lists.openembedded.org> wrote: > > From: Deepesh Varatharajan <Deepesh.Varatharajan@windriver.com> > > Previously, download-ci-llvm was set to false. However, with the following commit: > https://github.com/rust-lang/rust/commit/7d579046c80d3de3143dcb8b2db5640f95b5383c , > which has been present from rust_1.83, it was changed to true. As a result, after > updating to rust_1.83, we encountered the following error during the build: > > ------------------------------------------------------------------------------- > | thread 'main' panicked at src/core/config/config.rs:2047:13: > | setting build-target.llvm-config is incompatible with download-ci-llvm. > | note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace > ------------------------------------------------------------------------------- > > To resolve this issue, we are setting download-ci-llvm back to false. > > Signed-off-by: Deepesh Varatharajan <Deepesh.Varatharajan@windriver.com> > --- > meta/recipes-devtools/rust/rust_1.83.0.bb | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/meta/recipes-devtools/rust/rust_1.83.0.bb b/meta/recipes-devtools/rust/rust_1.83.0.bb > index c4f8ee7108..cd470b1883 100644 > --- a/meta/recipes-devtools/rust/rust_1.83.0.bb > +++ b/meta/recipes-devtools/rust/rust_1.83.0.bb > @@ -129,6 +129,7 @@ python do_configure() { > # [llvm] > config.add_section("llvm") > config.set("llvm", "static-libstdcpp", e(False)) > + config.set("llvm", "download-ci-llvm", e(False)) > if "llvm" in (d.getVar('TC_CXX_RUNTIME') or ""): > config.set("llvm", "use-libcxx", e(True)) The fix and the explanation is fine, but the ordering of commits isn't - if you place it after the version update, then anyone bisecting the build and landing on the update commit will see this breakage. It's better to make this the first commit, or to squash it into the update (preserving the explanation). Alex
On 05-03-2025 16:07, Alexander Kanavin wrote: > CAUTION: This email comes from a non Wind River email account! > Do not click links or open attachments unless you recognize the sender and know the content is safe. > > On Wed, 5 Mar 2025 at 07:02, Varatharajan, Deepesh via > lists.openembedded.org > <deepesh.varatharajan=windriver.com@lists.openembedded.org> wrote: >> From: Deepesh Varatharajan <Deepesh.Varatharajan@windriver.com> >> >> Previously, download-ci-llvm was set to false. However, with the following commit: >> https://github.com/rust-lang/rust/commit/7d579046c80d3de3143dcb8b2db5640f95b5383c , >> which has been present from rust_1.83, it was changed to true. As a result, after >> updating to rust_1.83, we encountered the following error during the build: >> >> ------------------------------------------------------------------------------- >> | thread 'main' panicked at src/core/config/config.rs:2047:13: >> | setting build-target.llvm-config is incompatible with download-ci-llvm. >> | note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace >> ------------------------------------------------------------------------------- >> >> To resolve this issue, we are setting download-ci-llvm back to false. >> >> Signed-off-by: Deepesh Varatharajan <Deepesh.Varatharajan@windriver.com> >> --- >> meta/recipes-devtools/rust/rust_1.83.0.bb | 1 + >> 1 file changed, 1 insertion(+) >> >> diff --git a/meta/recipes-devtools/rust/rust_1.83.0.bb b/meta/recipes-devtools/rust/rust_1.83.0.bb >> index c4f8ee7108..cd470b1883 100644 >> --- a/meta/recipes-devtools/rust/rust_1.83.0.bb >> +++ b/meta/recipes-devtools/rust/rust_1.83.0.bb >> @@ -129,6 +129,7 @@ python do_configure() { >> # [llvm] >> config.add_section("llvm") >> config.set("llvm", "static-libstdcpp", e(False)) >> + config.set("llvm", "download-ci-llvm", e(False)) >> if "llvm" in (d.getVar('TC_CXX_RUNTIME') or ""): >> config.set("llvm", "use-libcxx", e(True)) > The fix and the explanation is fine, but the ordering of commits isn't > - if you place it after the version update, then anyone bisecting the > build and landing on the update commit will see this breakage. It's > better to make this the first commit, or to squash it into the update > (preserving the explanation). > > Alex Sure, I will send a V4 with the suggested order . Regards, Deepesh
diff --git a/meta/recipes-devtools/rust/rust_1.83.0.bb b/meta/recipes-devtools/rust/rust_1.83.0.bb index c4f8ee7108..cd470b1883 100644 --- a/meta/recipes-devtools/rust/rust_1.83.0.bb +++ b/meta/recipes-devtools/rust/rust_1.83.0.bb @@ -129,6 +129,7 @@ python do_configure() { # [llvm] config.add_section("llvm") config.set("llvm", "static-libstdcpp", e(False)) + config.set("llvm", "download-ci-llvm", e(False)) if "llvm" in (d.getVar('TC_CXX_RUNTIME') or ""): config.set("llvm", "use-libcxx", e(True))