Use static libssh2_config.h on MacOS builds#1569
Merged
implausible merged 8 commits intoOct 19, 2018
Merged
Conversation
emmax86
force-pushed
the
fix/do-not-use-system-openssl-macos
branch
from
95cd77b to
23b98da
Compare
implausible
approved these changes
Oct 19, 2018
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
2 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.
Background:
Per the discussion in #1566, we are opting to use a static
libssh2_config.hfor MacOS builds.tl;dr: The
libssh2_config.hheader file is generated as a side effect of runningvendor/libssh2/configure, and necessary forlibssh2to build. The script it is trying to use the system headers to compile and test dynamic links to OpenSSL from libssh2. Node already these headers and links for us, or we provide our own (in the case of Electron). The configured header is safe and stable to provide statically.Summary of Changes
static_config. This is where statically provided configurations for our vendored dependencies will be found.openssl_distributions.jsonintovendor/static_config. Also updated the related utility scripts to use this location.vendor/libssh2/win32files intovendor/static_config/libssh2/win32.vendor/darwin/libssh2_config.h.win32ordarwindirectories fromvendor/static_config/libssh2intovendor/libssh2during theConfigure Libssh2build step.vendor/libssh2/darwinto theinclude_dirsfor MacOS builds oflibssh2. (Windows already did this respective action).