cmake: sync GSS config code with other deps #15545
Closed
Conversation
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
- drop `CMAKE_SHARED_LINKER_FLAGS` and `CMAKE_EXE_LINKER_FLAGS` that seem redundant over `link_directories()` - add libpaths to `CURL_LIBPATHS`. - use `curl_required_libpaths()` to pass the libpaths to the feature test. Fixes curl#15536
double-quotes requires to pass the whole list as a single argument to the macro.
To match the CFLAGS format returned by other Find modules.
Syncing this with other Find modules. With pkg-config this contains a copy of the libpath and the lib list. This causes them to appear as duplicates in `libcurl.pc` `Libs.private` and `curl-config`.
Say where these values are coming from. LDFLAGS is --libs.
E.g. on macOS these were: -dynamic -Wl,-search_paths_first Let's readd these if there is anything critical that's reported missing, otherwise sync with other Find modules that never bothered with misc dependency-specific LDFLAGS.
|
Analysis of PR #15545 at 97a8fcd5: Test 310 failed, which has NOT been flaky recently, so there could be a real issue in this PR. Generated by Testclutch |
This was referenced Nov 13, 2024
|
Using GSS in base, path is now missing is pc file |
curl's CMake do not add system libpaths to the .pc file. As detected via Before this patch this logic was accidentally circumvented for libpaths detected in this single GSS detection codepath, that's why it was there before. Is this causing any fallouts in your case? |
|
Works for me (tm) but it's inconsistent with GNU Autotools? |
Thanks for your tests! Yes, it seems inconsistent indeed. Assuming the CMake way is accurate, it would be nice in autotools too, though so far no one complained. Figuring out the system paths in autotools is also kind of difficult and manual. Something for a future PR. |
vszakats
pushed a commit
to vszakats/curl
that referenced
this pull request
Nov 15, 2024
Add gssapi to openssl job waiting for: - [x] curl#15564 - [x] curl#15545 Closes curl#15549
vszakats
pushed a commit
that referenced
this pull request
Nov 15, 2024
pps83
pushed a commit
to pps83/curl
that referenced
this pull request
Apr 26, 2025
- stop passing explicit libpaths via `CMAKE_SHARED_LINKER_FLAGS` and `CMAKE_EXE_LINKER_FLAGS`. `link_directories()` is doing that already. - use `curl_required_libpaths()` to pass libpaths to the feature test. Reported-by: Daniel Engberg Fixes curl#15536 Also fixes GSS feature detection with non-gcc/clang compilers, such as MSVC. - add libpaths to `CURL_LIBPATHS`. - move `GSS_CFLAGS`, `GSS_LDFLAGS` stringifications to FindGSS. To match the `CFLAGS` format returned by the rest of Find modules. - reorder calls to match other dependencies. - don't extend system `LDFLAGS` when FindGSS did not return any. - ignore `LDFLAGS` when detecting GSS via `pkg-config`. `LDFLAGS` holds a copy of libpaths and libs in this case. Ignore those to avoid these duplicates making into `libcurl.pc` and `curl-config`. Also syncing behavior with other Find modules which also ignore raw `LDFLAGS`. - ignore raw `LDFLAGS` coming from `krb5-config --libs`. FindGSS no longer returns dependency-specific `LDFLAGS` after this. Syncing behavior with other Find modules. - reduce scope of checker state push/pop/set. Closes curl#15545
pps83
pushed a commit
to pps83/curl
that referenced
this pull request
Apr 26, 2025
Ref: curl#15545 Ref: curl#15564 Ref: curl#15585 Closes curl#15549
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.
CMAKE_SHARED_LINKER_FLAGSandCMAKE_EXE_LINKER_FLAGS.link_directories()is doing that already.curl_required_libpaths()to pass libpaths to the feature test.Reported-by: Daniel Engberg
Fixes cmake: don't use quotes for GSS-API paths #15536
Also fixes GSS feature detection with non-gcc/clang compilers,
such as MSVC.
CURL_LIBPATHS.GSS_CFLAGS,GSS_LDFLAGSstringifications to FindGSS.To match the
CFLAGSformat returned by the rest of Find modules.LDFLAGSwhen FindGSS did not return any.LDFLAGSwhen detecting GSS viapkg-config.LDFLAGSholdsa copy of libpaths and libs in this case. Ignore those to avoid these
duplicates making into
libcurl.pcandcurl-config. Also syncingbehavior with other Find modules which also ignore raw
LDFLAGS.LDFLAGScoming fromkrb5-config --libs. FindGSSno longer returns dependency-specific
LDFLAGSafter this. Syncingbehavior with other Find modules.
w/o whitespace: https://github.com/curl/curl/pull/15545/files?w=1