Skip to content

Fix linux-armel build - #110514

Merged
akoeplinger merged 3 commits into
dotnet:mainfrom
am11:patch-31
Dec 9, 2024
Merged

Fix linux-armel build#110514
akoeplinger merged 3 commits into
dotnet:mainfrom
am11:patch-31

Conversation

@am11

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

Copy link
Copy Markdown
Member

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

Fixes#110517

@ghostghost 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-servicedotnet-policy-serviceBot added the community-contribution Indicates that the PR has been added by a community member label Dec 9, 2024
@am11am11 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

jkoritzinsky commented Dec 9, 2024

Copy link
Copy Markdown
Member

cc: @dotnet/samsung for review

@gbalykov

gbalykov commented Dec 9, 2024•
edited
Loading

Copy link
Copy Markdown
Member

@am11 should this go to arcade first?

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

@am11

am11 commented Dec 9, 2024

Copy link
Copy Markdown
MemberAuthor

@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
am11force-pushed the patch-31 branch 3 times, most recently from 217b670 to ffeebd5CompareDecember 9, 2024 05:37
@gbalykov

gbalykov commented Dec 9, 2024

Copy link
Copy Markdown
Member

@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
am11force-pushed the patch-31 branch 3 times, most recently from 941f263 to 70155e6CompareDecember 9, 2024 07:29
sirntar
sirntar approved these changes Dec 9, 2024
View reviewed changes

@sirntarsirntar left a comment

Copy link
Copy Markdown
Member

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
Closed
Closed
Closed
Closed
@akoeplinger

akoeplinger commented Dec 9, 2024

Copy link
Copy Markdown
Member

/ba-g failures are unrelated infrastructure issues

@akoeplinger
akoeplinger merged commit 28cf901 into dotnet:mainDec 9, 2024
@akoeplinger

akoeplinger commented Dec 9, 2024

Copy link
Copy Markdown
Member

Thank you!

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

@gbalykovgbalykov left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM

@akoeplinger

akoeplinger commented Dec 11, 2024

Copy link
Copy Markdown
Member

/backport to release/9.0-staging

@github-actions

github-actionsBot commented Dec 11, 2024

Copy link
Copy Markdown
Contributor

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

@github-actionsgithub-actionsBot 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.
Fixesdotnet#110517
@akoeplingerakoeplinger mentioned this pull request Dec 17, 2024
Merged
4 tasks
@jkotasjkotas mentioned this pull request Dec 17, 2024
Open
@github-actionsgithub-actionsBot locked and limited conversation to collaborators Jan 11, 2025
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@akoeplingerakoeplingerakoeplinger approved these changes
+3 more reviewers
@gbalykovgbalykovgbalykov approved these changes
@sirntarsirntarsirntar approved these changes
@t-mustafint-mustafint-mustafin approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

area-Infrastructurecommunity-contributionIndicates 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