cmake: detect nettle when building with GnuTLS#14285
Closed
vszakats wants to merge 11 commits intocurl:masterfrom
Closed
cmake: detect nettle when building with GnuTLS#14285vszakats wants to merge 11 commits intocurl:masterfrom
nettle when building with GnuTLS#14285vszakats wants to merge 11 commits intocurl:masterfrom
Conversation
nettle when building with GnuTLS
`nettle` is a direct dependency of curl, when building with GnuTLS. Detect it as such. Follow-up to 781242f curl#11967 Closes #xxxxx
b7831a7 to
0a8ddbd
Compare
3 tasks
This reverts commit 658e84a. GnuTLS autotools build fails on macOS: ``` configure: error: GnuTLS found, but nettle was not found ``` https://github.com/curl/curl/actions/runs/10125730919/job/28001564901?pr=14285#step:8:250
talregev
reviewed
Jul 28, 2024
vszakats
added a commit
to vszakats/curl
that referenced
this pull request
Jul 30, 2024
The oldest cmake supported by curl is 3.7.0, which already has a guard inside `pkg_check_modules()`. The advantage of leaving that to CMake is that it will define/reset all variables, while the manual guard doesn't do this and also leave `NETTLE_FOUND` undefined. Delete the single use of this check in the recently added NETTLE patch by accident. And re-introduce this later everywhere if we find it useful after more evaluation. Follow-up to 669ce42 curl#14285 Closes curl#14309
vszakats
added a commit
that referenced
this pull request
Jul 30, 2024
The oldest cmake supported by curl is v3.7.0, which already has such guard (using `PKG_CONFIG_EXECUTABLE`) inside `pkg_check_modules()`. The advantage of leaving that guard to CMake is that it will define/reset all output variables, while the manual guard doesn't do this and also leaves for example `NETTLE_FOUND` undefined. Delete the single use of this guard from the recently added `nettle` detection, where I included it by accident. Then possibly re-introduce it universally if we find it useful after more evaluation. Follow-up to 669ce42 #14285 Closes #14309
|
I get this with 8.9.1: There is no Findnettle.cmake in the release tarball |
|
I just took the file from git for now. With that all seems fine. |
Member
Author
|
Thanks for the report and I'm sorry about this. → #14320 |
|
No problem :) thanks! |
vszakats
added a commit
to vszakats/curl
that referenced
this pull request
Jul 31, 2024
Follow-up to 669ce42 curl#14285 Reported-by: Christoph Reiter Bug: curl#14285 (comment) Closes curl#14320
vszakats
added a commit
that referenced
this pull request
Jul 31, 2024
Follow-up to 669ce42 #14285 Reported-by: Christoph Reiter Bug: #14285 (comment) Closes #14320
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
nettleis a direct dependency of curl, when building with GnuTLS.Add a new
Findmodule to detect it.Also:
nettlehack no longer necessary.nettletolibcurl.pc.nettletolibcurl.pcin autotools builds.Follow-up to 781242f #11967
Closes #14285