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

Jump to bottom

Fix linux-armel build #110514

Merged
merged 3 commits into from
Dec 9, 2024
Merged

Fix linux-armel build #110514

merged 3 commits into from
Dec 9, 2024

Conversation

am11
Copy link
Member

@am11 am11 commented Dec 9, 2024 •
edited by jkotas
Loading

This syncs the gcc version in toolchian file with what's in the newest container build.

Fixes #110517

@dotnet-issue-labeler dotnet-issue-labeler bot added the needs-area-label An area label is needed to ensure this gets routed to the appropriate area owners label Dec 9, 2024
@dotnet-policy-service dotnet-policy-service bot added the community-contribution Indicates that the PR has been added by a community member label Dec 9, 2024
@am11 am11 added area-Infrastructure and removed needs-area-label An area label is needed to ensure this gets routed to the appropriate area owners labels Dec 9, 2024
This was referenced Dec 9, 2024
Merged
Merged
@jkoritzinsky
Copy link
Member

cc: @dotnet/samsung for review

@gbalykov
Copy link
Member

gbalykov commented Dec 9, 2024 •
edited
Loading

@am11 should this go to arcade first?

Upd: don't mind, I missed another PR to arcade

@am11
Copy link
Member Author

am11 commented Dec 9, 2024

@gbalykov another approach is to make it dynamic for all of these:

eng/common/cross/toolchain.cmake:    set(TIZEN_TOOLCHAIN "armv7hl-tizen-linux-gnueabihf/9.2.0")
eng/common/cross/toolchain.cmake:      set(TIZEN_TOOLCHAIN "aarch64-tizen-linux-gnu/9.2.0")
eng/common/cross/toolchain.cmake:    set(TIZEN_TOOLCHAIN "armv7l-tizen-linux-gnueabi/9.2.0")
eng/common/cross/toolchain.cmake:      set(TIZEN_TOOLCHAIN "riscv64-tizen-linux-gnu/13.1.0")
eng/common/cross/toolchain.cmake:      set(TIZEN_TOOLCHAIN "x86_64-tizen-linux-gnu/9.2.0")
eng/common/cross/toolchain.cmake:    set(TIZEN_TOOLCHAIN "i586-tizen-linux-gnu/9.2.0")

For other platforms, we don't have version at that location. In Tizen containers, there is always a single versioned directory there. So we can search it using cmake's GLOB_DIRECTORY. WDYT?

@am11 am11 force-pushed the patch-31 branch 3 times, most recently from 217b670 to ffeebd5 Compare December 9, 2024 05:37
@gbalykov
Copy link
Member

gbalykov commented Dec 9, 2024

@gbalykov another approach is to make it dynamic for all of these:


eng/common/cross/toolchain.cmake:    set(TIZEN_TOOLCHAIN "armv7hl-tizen-linux-gnueabihf/9.2.0")

eng/common/cross/toolchain.cmake:      set(TIZEN_TOOLCHAIN "aarch64-tizen-linux-gnu/9.2.0")

eng/common/cross/toolchain.cmake:    set(TIZEN_TOOLCHAIN "armv7l-tizen-linux-gnueabi/9.2.0")

eng/common/cross/toolchain.cmake:      set(TIZEN_TOOLCHAIN "riscv64-tizen-linux-gnu/13.1.0")

eng/common/cross/toolchain.cmake:      set(TIZEN_TOOLCHAIN "x86_64-tizen-linux-gnu/9.2.0")

eng/common/cross/toolchain.cmake:    set(TIZEN_TOOLCHAIN "i586-tizen-linux-gnu/9.2.0")

For other platforms, we don't have version at that location. In Tizen containers, there is always a single versioned directory there. So we can search it using cmake's GLOB_DIRECTORY. WDYT?

I think it's a good thing to do since it simplifies things

@am11 am11 force-pushed the patch-31 branch 3 times, most recently from 941f263 to 70155e6 Compare December 9, 2024 07:29
sirntar
sirntar approved these changes Dec 9, 2024
View reviewed changes
Copy link
Member

@sirntar sirntar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

This was referenced Dec 9, 2024
Open
Open
Closed
Open
@akoeplinger
Copy link
Member

/ba-g failures are unrelated infrastructure issues

@akoeplinger akoeplinger merged commit 28cf901 into dotnet:main Dec 9, 2024
140 of 147 checks passed
@akoeplinger
Copy link
Member

Thank you!

@am11 am11 deleted the patch-31 branch December 9, 2024 11:51
gbalykov
gbalykov reviewed Dec 10, 2024
View reviewed changes
Copy link
Member

@gbalykov gbalykov left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@akoeplinger
Copy link
Member

/backport to release/9.0-staging

@github-actions GitHub Actions
Copy link
Contributor

Started backporting to release/9.0-staging: https://github.com/dotnet/runtime/actions/runs/12278369811

@github-actions github-actions bot mentioned this pull request Dec 11, 2024
Merged
4 tasks
hez2010 pushed a commit to hez2010/runtime that referenced this pull request Dec 14, 2024
@am11 @hez2010
Fix linux-armel build (dotnet#110514)
9df306f 
This syncs the gcc version in toolchian file with what's in the newest container build.

Fixes dotnet#110517
@akoeplinger akoeplinger mentioned this pull request Dec 17, 2024
Merged
4 tasks
@jkotas jkotas mentioned this pull request Dec 17, 2024
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gbalykov gbalykov gbalykov approved these changes

@t-mustafin t-mustafin t-mustafin approved these changes

@sirntar sirntar sirntar approved these changes

@akoeplinger akoeplinger akoeplinger approved these changes

Assignees
No one assigned
Labels
area-Infrastructure community-contribution Indicates that the PR has been added by a community member
Projects
Runtime Infra
Status: Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

linux-armel checked CoreCLR_NonPortable build failing in CI
6 participants
@am11 @jkoritzinsky @gbalykov @akoeplinger @sirntar @t-mustafin