Improve bundling libssh2 for mac#10
Open
eddymoulton wants to merge 4 commits intooctopus/masterfrom
Open
Conversation
eddymoulton
changed the title
liam-mackie
approved these changes
May 5, 2026
|
|
||
| is_homebrew_path() { | ||
| case "$1" in | ||
| /opt/homebrew/*|/usr/local/Cellar/*|/usr/local/opt/*) return 0 ;; |
There was a problem hiding this comment.
Suggested change
| /opt/homebrew/*|/usr/local/Cellar/*|/usr/local/opt/*) return 0 ;; | |
| /opt/homebrew/*|/usr/local/Cellar/*) return 0 ;; |
Consider not including /usr/local/opt/* so that we don't accidentally bundle libraries that come from tools like xcode (and so might have dependencies across osx versions)
|
|
||
| # Ad-hoc re-sign — install_name_tool invalidates the existing signature, which is fatal on Apple Silicon. | ||
| for DYLIB in "$NATIVE_DIR"/*.dylib; do | ||
| codesign --force --sign - "$DYLIB" |
There was a problem hiding this comment.
May be worth checking that this works on laptops that don't have arm64e signing exclusions in their NVRAM
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.
For just Mac (not linux or windows) we are able to include all of the required binaries alongside libgit2 so users don't need to bring their own.
This not desirable for Linux or Windows because we want to allow users to bring their own crypto library for FIPS compliance, which those builds already do.
Because we do not ship a version of Octopus server for Mac (it's only used for development), we can accept that we include the crypto library with this package.