Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Default to dynamically linking libsodium, static link on wheels #145

Merged
merged 8 commits into from
Nov 16, 2020
Merged

Default to dynamically linking libsodium, static link on wheels #145

merged 8 commits into from
Nov 16, 2020

Conversation

hoffmang9
Copy link
Member

@hoffmang9 hoffmang9 commented Nov 15, 2020 •
edited
Loading

  • Now, if libsodium is found the build process will default to dynamically linking libsodium. This should ease cross platform building.
  • If $CIBUILDWHEEL is set in the environment, libsodium will be statically linked. That is the default when building binary wheels on ci.
  • Moved valgrind to test the statically linked libsodium version of bls-library.
  • "By hand" (using strings) validated the published wheels for all four targets are getting statically linked from cibuildwheel.
  • Have relic upstream a fix to FreeBSD and OpenBSD
    -Correct "DSEED" typo - though note that "SEED" defaults to the correct random device so there should be no historical issue.

@hoffmang9 hoffmang9 requested a review from wjblanke November 15, 2020 14:38
@hoffmang9
Copy link
Member Author

I have also confirmed that the bsd compile issues are either a relic issue or we're note handing relic the right options. Debugging that now. See these earlier fixes from @n1000 :
5a7c703
fcc10ef

@hoffmang9
Copy link
Member Author

I've made an upstream pull request to Relic. - relic-toolkit/relic#164

Once that's complete we will probably need to address the changes previously made to our Cmakelist.txts outlined here - 5a7c703

@hoffmang9
Copy link
Member Author

image
With the Relic upstream, pip install . is working fine on FreeBSD!

@hoffmang9 hoffmang9 mentioned this pull request Nov 15, 2020
Closed
@hoffmang9 hoffmang9 mentioned this pull request Nov 15, 2020
Closed
wjblanke
wjblanke approved these changes Nov 16, 2020
View reviewed changes
Copy link
Contributor

@wjblanke wjblanke left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does SODIUM_STATIC need to be based on CI_BUILDWHEEL as well?

Approving but we may need to revisit

@wjblanke wjblanke merged commit 4bed72b into master Nov 16, 2020
@hoffmang9 hoffmang9 deleted the de-static branch November 16, 2020 20:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wjblanke wjblanke wjblanke approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@hoffmang9 @wjblanke