Repository navigation
Link libsodium through session-deps - #54
Draft
mpretty-cyro wants to merge 2 commits into
Draft
mpretty-cyro wants to merge 2 commits into
mpretty-cyro wants to merge 2 commits into
Conversation
libsession-util is moving from the libsodium-internal fork to session-deps' stock libsodium, so the libsodium::sodium-internal target goes away. Merge together with the libsession-util re-pin.
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
1 participant
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.
libsession-util now takes its dependencies from
cmake/session-deps(replacing thelibsodium-internal,zstdandsimdutfsubmodules), so thelibsodium::sodium-internaltarget no longer exists. This changes the one place the wrapper links it, tosessiondep::libsodium, and re-pins libsession-util todev(1d565e31->d8d540bb), where the session-deps backport landed.devalready contains 1.9.1, so the re-pin only moves forward.The two have to land together: the new target only exists from the re-pinned libsession-util on, which is why the previous CI run failed at CMake configure.
Tested:
./gradlew check(what CI runs) passes on this branch: all four ABIs build and link, NDK 28.2. Not run on a device here.macOS hosts: session-deps' autoconf builds use the host
ar, which writes an unusablelibsodium.afor Android targets on a mac (undefinedcrypto_*at link). Linux CI is unaffected. Until that is fixed in session-deps, a local mac build needsARandRANLIBpointed at the NDK'sllvm-arandllvm-ranlib. The fix is session-deps-side and separate from this PR.