Repository navigation
Conversation
1397916 to
7be485f
Compare
|
Maybe in other PR we can have krb5 and it version? |
|
Version detection already works with krb5, or did you mean something else?: |
I meant that it will be in here. |
That a good a nice step. I like it! |
Ah, got it, to the |
39dd972 to
bd0c897
Compare
150a8ae to
3190ee2
Compare
I think is very important, because now when I got curl from ubuntu, I don't know which library was compile to get gsasl-api feature, and what the version it there. If users know, they can easly report to ubuntu (or other distro) or get decision if to use that curl. |
Do you mean to split FindGSS into FindHeimdal and Findkrb5, or? |
If it already happen in FindGSS that is good, and not need to change. |
|
I see that file now, and that is a good direction. In the future, if we see that the logic is large in FindGSS, we can think to split. Maybe it will be more easy to handle? |
It does. They are certainly not over-tested, so more tests and reports are welcome. |
b8cd6b9 to
b3d0977
Compare
Also re-sort Makefile.am list.
…nfig detections Making the call doesn't give anything useful. The only difference is that it will defined the `<original_case>_FOUND` variable over the fully uppercase version. And also omits the standard 'Found' log messages. On the other hand it will show a misleading error message when the dependency is not found, but saying that the `_INCLUDE_DIRS` and `_LIBRARIES` vars are missing, while in fact we use `_INCLUDE_DIR` and `_LIBRARY` for that. Re-add the log message manually for pkg-config detections to smoothen out that difference.
17fe64c to
556263d
Compare
Drop `find_package(libssh CONFIG)` detection method in favour of the Find module that supports both `pkg-config`, and CMake-native (since #14555) detection. This aligns `libssh` detection with other dependencies. It makes the build honor custom configuration via `LIBSSH_INCLUDE_DIR`, `LIBSSH_LIBRARY`. Also enable libssh in a GHA/macos cmake job for build coverage. Fixing: - curl-for-win requiring a hack to configure libssh: https://github.com/curl/curl-for-win/blob/4f9acbed92fd4aac0e874c9a591bec7d621cd9f2/curl.sh#L255-L263 - after #14555, GHA/windows gnutls vcpkg job no longer auto-detected libssh, due to a regression missing to enable libssh when found via `find_package(libssh CONFIG)`. Ref: https://github.com/curl/curl/actions/runs/10470138955/job/28994650338 Follow-up to 422696f #14555 Closes #14614
The recent libcurl update in commit 0919f39 ("third_party: update libcurl from 8.8.0 to 8.10.1") reveals an old problem in our libcurl's build script: it attempts to disable the libidn2 dependency using the `-DHAVE_LIBIDN2=OFF` option instead of `-DUSE_LIBIDN2=OFF`. It doesn't work after a recent curl building machinery change, see curl/curl#14555 This commit fixes the problem by using `-DUSE_LIBIDN2=OFF`. Reported in tarantool#10621 NO_DOC=build mechanics fixup NO_CHANGELOG=fixes a non-released commit NO_TEST=verified locally, seems to need an extra work on a separate CI workflow with a particular building environment; no time for that tonight, sorry
The recent libcurl update in commit 0919f39 ("third_party: update libcurl from 8.8.0 to 8.10.1") reveals an old problem in our libcurl's build script: it attempts to disable the libidn2 dependency using the `-DHAVE_LIBIDN2=OFF` option instead of `-DUSE_LIBIDN2=OFF`. It doesn't work after a recent curl building machinery change, see curl/curl#14555 This commit fixes the problem by using `-DUSE_LIBIDN2=OFF`. Reported in #10621 NO_DOC=build mechanics fixup NO_CHANGELOG=fixes a non-released commit NO_TEST=verified locally, seems to need an extra work on a separate CI workflow with a particular building environment; no time for that tonight, sorry
The recent libcurl update in commit 0919f39 ("third_party: update libcurl from 8.8.0 to 8.10.1") reveals an old problem in our libcurl's build script: it attempts to disable the libidn2 dependency using the `-DHAVE_LIBIDN2=OFF` option instead of `-DUSE_LIBIDN2=OFF`. It doesn't work after a recent curl building machinery change, see curl/curl#14555 This commit fixes the problem by using `-DUSE_LIBIDN2=OFF`. Reported in tarantool#10621 NO_DOC=build mechanics fixup NO_CHANGELOG=fixes a non-released commit NO_TEST=verified locally, seems to need an extra work on a separate CI workflow with a particular building environment; no time for that tonight, sorry (cherry picked from commit a4b4158)
The recent libcurl update in commit 0919f39 ("third_party: update libcurl from 8.8.0 to 8.10.1") reveals an old problem in our libcurl's build script: it attempts to disable the libidn2 dependency using the `-DHAVE_LIBIDN2=OFF` option instead of `-DUSE_LIBIDN2=OFF`. It doesn't work after a recent curl building machinery change, see curl/curl#14555 This commit fixes the problem by using `-DUSE_LIBIDN2=OFF`. Reported in tarantool#10621 NO_DOC=build mechanics fixup NO_CHANGELOG=fixes a non-released commit NO_TEST=verified locally, seems to need an extra work on a separate CI workflow with a particular building environment; no time for that tonight, sorry (cherry picked from commit a4b4158)
The recent libcurl update in commit 0919f39 ("third_party: update libcurl from 8.8.0 to 8.10.1") reveals an old problem in our libcurl's build script: it attempts to disable the libidn2 dependency using the `-DHAVE_LIBIDN2=OFF` option instead of `-DUSE_LIBIDN2=OFF`. It doesn't work after a recent curl building machinery change, see curl/curl#14555 This commit fixes the problem by using `-DUSE_LIBIDN2=OFF`. Reported in #10621 NO_DOC=build mechanics fixup NO_CHANGELOG=fixes a non-released commit NO_TEST=verified locally, seems to need an extra work on a separate CI workflow with a particular building environment; no time for that tonight, sorry (cherry picked from commit a4b4158)
The recent libcurl update in commit 0919f39 ("third_party: update libcurl from 8.8.0 to 8.10.1") reveals an old problem in our libcurl's build script: it attempts to disable the libidn2 dependency using the `-DHAVE_LIBIDN2=OFF` option instead of `-DUSE_LIBIDN2=OFF`. It doesn't work after a recent curl building machinery change, see curl/curl#14555 This commit fixes the problem by using `-DUSE_LIBIDN2=OFF`. Reported in #10621 NO_DOC=build mechanics fixup NO_CHANGELOG=fixes a non-released commit NO_TEST=verified locally, seems to need an extra work on a separate CI workflow with a particular building environment; no time for that tonight, sorry (cherry picked from commit a4b4158)
For: libgsasl, libidn2, libssh, libuv.
The new Find modules retain using
pkg-confignatively, not as a "hint"for the CMake-native detection. Of the pre-existing Find modules, only
FindNettle, and FindGSS (with customized code) work this way. Align
detection code for the new modules and add version detection for the
CMake-native paths.
Also, add CMake-native detection for
libgsasl.The remaining outlier in
CMakeLists.txtis GnuTLS, which hasa CMake built-in Find module, but which lacks
pkg-configsupport,required for vcpkg. It remains unchanged.
Another part-outlier is
libssh, which keeps requiring the trickfind_package(libssh CONFIG QUIET)for reasons I could not yet figureout.
pkg-configif custom config is set via<NAME>_INCLUDE_DIR/<NAME>_LIBRARY? (Separate PR?)if(EXISTS), more flexible regexp and synced var names. → cmake: sync up version detection in Find modules #14572