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.

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

[vcpkg scripts] enable patchelf on windows for cross-compiling toolchains #41578

Merged
merged 1 commit into from
Oct 17, 2024

Conversation

cenit
Copy link
Contributor

@cenit cenit commented Oct 15, 2024

Add handling of patchelf on windows, in case of cross-compiling toolchains (e.g. arm linaro on windows)

if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux")
set(program_version 0.14.5)
Copy link
Contributor

Choose a reason for hiding this comment

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

Note for reviewers: the previous update attempt was in #31107 and no new releases happened after that.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

i didn't try any update for linux, this is the previous version confirmed.

the windows version (newer) is still untested, i am building the pipeline and upstreaming everything possible as soon as i can

@BillyONeal
Copy link
Member

/azp run

@BillyONeal
Copy link
Member

Rerunning due to network mistake last night.

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@JonLiu1993 JonLiu1993 changed the title enable patchelf on windows for cross-compiling toolchains [vcpkg scripts] enable patchelf on windows for cross-compiling toolchains Oct 16, 2024
@JonLiu1993 JonLiu1993 added the category:tool-update The issue is with build tool or build script, which requires update or should be executed correctly label Oct 16, 2024
@@ -16,4 +16,15 @@ if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux")
set(download_urls "https://github.com/NixOS/patchelf/releases/download/${program_version}/${download_filename}")
set(tool_subdirectory "${program_version}-${patchelf_platform}-linux")
set(paths_to_search "${DOWNLOADS}/tools/patchelf/${program_version}-${patchelf_platform}-linux/bin")
elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")
set(patchelf_host "win32")
set(program_version 0.18.0)
Copy link
Member

Choose a reason for hiding this comment

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

@cenit, thanks for your PR. From PR #31107, there are some issues with version 0.18.0.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

still better than erroring out because it's missing? i didn't update the linux version, i just added a windows one

Copy link
Contributor Author

Choose a reason for hiding this comment

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

as a side note, there is no 0.14.5 version of patchelf for windows. The first version that was built for windows is 0.17.0, so since I had to choose one, I went for the newest one

@JonLiu1993 JonLiu1993 added the info:reviewed Pull Request changes follow basic guidelines label Oct 16, 2024
@data-queue data-queue merged commit 1059769 into microsoft:master Oct 17, 2024
16 checks passed
@cenit cenit deleted the dev/cenit/patchelf_win branch October 17, 2024 10:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:tool-update The issue is with build tool or build script, which requires update or should be executed correctly info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants