fix {Open,Boring}SSL conflicts - #376
Merged
Merged
Conversation
nbsp
force-pushed
the
nbsp/worktree/bssl
branch
from
August 14, 2024 04:45
81c93a5 to
b60a9d5
Compare
nbsp
marked this pull request as ready for review
August 14, 2024 04:47
davidzhao
approved these changes
Aug 14, 2024
| fi | ||
|
|
||
| cd src | ||
| git fetch origin m114_release |
Member
There was a problem hiding this comment.
I guess this branch has not updated to m125 yet? it would be upgrade too
Contributor
Author
There was a problem hiding this comment.
not yet. currently we use m114, but because m125 was released we now need to manually checkout. the fix_m114 patch deals with a few bugs that were fixed in the new version. i think upgrading is better suited for a future PR, let's get this tagged first
Member
There was a problem hiding this comment.
sounds good. agreed it should be in a separate PR
Contributor
|
Definitivelly awesome work!!! |
kuba--
approved these changes
Aug 14, 2024
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.
uses
objcopyto rename all exported BoringSSL symbols, prependingLK_to them, so that they don't conflict with native OpenSSL on the Rust side.previous PR description before figuring this out below.
PR for review.
trying a different approach than manually patching in the list (though that's still available & commented out), since even when it finally built (90 minute patch time!) it fixed nothing.
the BoringSSL build doc gives us an option to prefix all BSSL symbols with whatever we want, in our case
LK. i've punched that into theBUILD.gnfile, and it builds just fine in this diff, but thebasic_roomlinking fails with a lot of the following erroreven after i've manually gone in and updated the files to use
LK_-prefixed symbols, they just don't link. fresh building environment. i don't know exactly how it would compile by itself (clearly no undefined symbols) and then fail at thebasic_roomlink phase.