Makefile.m32: support more options [ci skip] #9680
Closed
+91
−40
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
GNU Make 'VAR += 1' adds an extra space prefix when VAR is not empty.
This no longer makes sure that wolfssh is used with wolfssl. Caller needs to do so. This fixes the libssh + libressl issue with colliding public symbols, by making sure to include the ssh lib first. This aligns with cmake/autotools, both of which include ssh lib first. This fixes the above issue silently.
Caller must pass the ngtcp2 crypto lib manually via NGTCP2_LIBS, when using a custom SSL backend.
obonaventure
pushed a commit
to mptcp-apps/curl
that referenced
this pull request
Oct 12, 2022
- Add support for these options:
`-wolfssl`, `-wolfssh`, `-mbedtls`, `-libssh`, `-psl`
Caveats:
- `-wolfssh` requires `-wolfssl`.
- `-wolfssl` cannot be used with OpenSSL backends in parallel.
- `-libssh` has build issues with BoringSSL and LibreSSL, and also
what looks like a world-writable-config vulnerability on Windows.
Consider it experimental.
- `-psl` requires `-idn2` and extra libs passed via
`LIBS=-liconv -lunistring`.
- Detect BoringSSL/wolfSSL and set ngtcp2 crypto lib accordingly.
- Generalize MultiSSL detection.
- Use else-if syntax. Requires GNU Make 3.81 (2006-04-01).
- Document more customization options.
This brings over some configuration logic from `curl-for-win`.
Closes curl#9680
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.
-wolfssl,-wolfssh,-mbedtls,-libssh,-pslCaveats:
-wolfsshrequires-wolfssl.-wolfsslcannot be used with OpenSSL backends in parallel.-libsshhas build issues with BoringSSL and LibreSSL, and alsowhat looks like a world-writable-config vulnerability on Windows.
Consider it experimental.
-pslrequires-idn2and extra libs passed viaLIBS=-liconv -lunistring.This brings over some configuration logic from
curl-for-win.Closes #9680
Cleaner patch w/o whitespace changes: https://github.com/curl/curl/pull/9680/files?w=1