[pull] master from curl:master #292
Merged
Conversation
This file contains 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
![pull[bot]](https://avatars.githubusercontent.com/in/12910?s=60&v=4){kind=small}
…vcpkg iOS: - add jobs with autotools, CMake, CMake Xcode generator. The Xcode generator is >10x slower than Unix Makefiles. Keep it because it's the one recommended by CMake and for having its own quirks we may want to know about. - build, cache and use LibreSSL for these jobs. With workaround for an iOS build issue fixed in master. - make Xcode generator work by explicitly disabling code signing. - make tests and examples build with the Xcode generator by setting `-DMACOSX_BUNDLE_GUI_IDENTIFIER=se.curl`, to avoid "Bundle identifier is missing" errors. - cmake: disable `CURL_USE_PKGCONFIG` by default for Apple device. - cmake: add `stdc++` library for BoringSSL and AWS-LC, with `OPENSSL_USE_STATIC_LIBS=ON` set. - cmake: add workaround for Xcode generator issue, where it cannot handle two targets depending on one custom command. A better fix may be dropping `tool_hugehelp.c` and `tool_ca_embed.c` from curltool library. For a future PR. Android: - add vcpkg to Android jobs, enable dependencies. Assisted-by: Tal Regev via #16045 - make vcpkg work with autotools. - pass `--with-brotli` to autotools to detect the vcpkg-supplied brotli. - enable BoringSSL for Android and add a job with it. - silence 457 CMake configure warnings about the Android NDK CMake scripts targeting freshly deprecated CMake versions. These were much more involved than imagined. Basically nothing works out of the box, and when combined, everything becomes a unique edge case. autotools builds were a much easier to make work than CMake ones. Also: - GHA/non-native: re-sync names to be shorter and more aligned with other workflows. - GHA: add `persist-credentials: false` where missing. Unresolved issues: - `OPENSSL_ROOT_DIR` ignored/mis-used when pointing it to LibreSSL. CMake seems to prepend the sysroot to the passed absolute directory. Found no workaround. - CMake when combined with Android, both the Google-recommended method and the built-in CMake method fail to provide a way to avoid `pkg-config` packages at system directories. Failed to find a knob that can remove `/usr/include` from the search path. The workaround is to disable zstd. (I enabled it by default in this release, maybe premature?: f2adb3b #15431) Disabling `pkg-config` doesn't work because vcpkg dependencies do not link without it. - CMake's Xcode generator is slow because each `try_compile()` feature check springs a new CMake + Xcode project taking a long time to run, just to compile single-liner C files. A known issue, with no solution. `-DCMAKE_MACOSX_BUNDLE=OFF` did not help, limiting build types to a single one (e.g. `Debug`) also had no effect. make | Xcode | GHA run :---- | :---- | :-------------------------------------------------------------------- 16s | 2m57s | https://github.com/curl/curl/actions/runs/12866334102/job/35868712426 23s | 4m13s | https://github.com/curl/curl/actions/runs/12868128013/job/35874212461 16s | 3m39s | https://github.com/curl/curl/actions/runs/12859073531/job/35849041880 14s | 2m23s | https://github.com/curl/curl/actions/runs/12858298423/job/35847201313 15s | 2m36s | https://github.com/curl/curl/actions/runs/12858058492/job/35846669761 19s | 3m19s | https://github.com/curl/curl/actions/runs/12868919430/job/35876601168 Closes #16043
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
See Commits and Changes for more details.
Created by
pull[bot] (v2.0.0-alpha.1)
Can you help keep this open source service alive? 💖 Please sponsor : )