FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Fix linux-armel build by am11 · Pull Request #110514 · dotnet/runtime · GitHub

  1. dotnet
  2. runtime

Repository navigation

Fix linux-armel build - #110514

Merged
akoeplinger merged 3 commits into
dotnet:mainfrom
am11:patch-31
Dec 9, 2024
ConversationCommits (3)ChecksFiles changed
Merged

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

Conversation

am11 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

ghost 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 Bot added the community-contribution Indicates that the PR has been added by a community member label Dec 9, 2024
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 commented Dec 9, 2024

Copy link
Copy Markdown
Member

cc: @dotnet/samsung for review

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 commented Dec 9, 2024

Copy link
Copy Markdown
Member Author

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

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

sirntar 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.

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

LGTM

This was referenced Dec 9, 2024
Closed
Closed
Closed
Closed

akoeplinger commented Dec 9, 2024

Copy link
Copy Markdown
Member

/ba-g failures are unrelated infrastructure issues

akoeplinger merged commit 28cf901 into dotnet:main Dec 9, 2024

akoeplinger commented Dec 9, 2024

Copy link
Copy Markdown
Member

Thank you!

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

gbalykov 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.

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

LGTM

akoeplinger commented Dec 11, 2024

Copy link
Copy Markdown
Member

/backport to release/9.0-staging

github-actions Bot 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-actions Bot mentioned this pull request Dec 11, 2024
Merged
3 of 4 tasks
hez2010 pushed a commit to hez2010/runtime that referenced this pull request Dec 14, 2024
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 mentioned this pull request Dec 17, 2024
Merged
3 of 4 tasks
jkotas mentioned this pull request Dec 17, 2024
Open
github-actions Bot locked and limited conversation to collaborators Jan 11, 2025
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

akoeplinger akoeplinger approved these changes
+3 more reviewers
gbalykov gbalykov approved these changes
sirntar sirntar approved these changes
t-mustafin t-mustafin approved these changes
Reviewers whose approvals may not affect merge requirements

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

Back | FazBrowse Home | New Git URL