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

[curl] fix config on iOS #35662

Merged
merged 3 commits into from
Dec 18, 2023
Merged

Conversation

marksinkovics
Copy link
Contributor

@marksinkovics marksinkovics commented Dec 13, 2023

This PR fixes the CMake configuration step of curl on iOS (community triplets: arm64-ios, x64-ios)

Another PR is opened to the CURL repository with this fix: curl/curl#12515

  • Changes comply with the maintainer guide
  • SHA512s are updated for each updated download
  • The "supports" clause reflects platforms that may be fixed by this new version
  • Any fixed CI baseline entries are removed from that file.
  • Any patches that are no longer applied are deleted from the port's directory.
  • The version database is fixed by rerunning ./vcpkg x-add-version --all and committing the result.
  • Only one version is added to each modified port's versions file.

Thank you very much for reviewing!

@marksinkovics
Copy link
Contributor Author

marksinkovics commented Dec 13, 2023

@microsoft-github-policy-service agree

@Osyotr
Copy link
Contributor

Osyotr commented Dec 13, 2023

Upstream PR?

@marksinkovics
Copy link
Contributor Author

Upstream PR?

Thanks you for the reminder, I opened a PR on CURL repo as well. curl/curl#12515

@Cheney-W Cheney-W changed the title fix: curl config on iOS [curl] fix config on iOS Dec 14, 2023
@Cheney-W Cheney-W added category:port-bug The issue is with a library, which is something the port should already support depends:upstream-changes Waiting on a change to the upstream project labels Dec 14, 2023
@Cheney-W
Copy link
Contributor

Waiting for the final decision from upstream.

@Cheney-W Cheney-W removed the depends:upstream-changes Waiting on a change to the upstream project label Dec 15, 2023
@Cheney-W
Copy link
Contributor

Please run:

vcpkg x-add-version curl --overwrite-version
git add versions
git commit -m "Update version database"

@marksinkovics
Copy link
Contributor Author

marksinkovics commented Dec 15, 2023

Thank you @Cheney-W for the quick help! My PR (curl/curl#12515) successfully passed all CI tests, and it received 1 approve so far, and waiting for another comments or merge.

@marksinkovics
Copy link
Contributor Author

Update: the PR has been merged curl/curl#12515 on CURL side with the same changes.

@Cheney-W Cheney-W added the info:reviewed Pull Request changes follow basic guidelines label Dec 18, 2023
@BillyONeal BillyONeal merged commit 1bb45db into microsoft:master Dec 18, 2023
15 checks passed
@BillyONeal
Copy link
Member

Thanks for the fix and for submitting it upstream!

@marksinkovics marksinkovics deleted the fix/curl-config-ios branch December 29, 2023 15:46
Osyotr pushed a commit to Osyotr/vcpkg that referenced this pull request Jan 23, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:port-bug The issue is with a library, which is something the port should already support info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants