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

Ship both x86 and aarch64 darwin libs #79

Merged
merged 9 commits into from
Sep 18, 2022
Merged

Ship both x86 and aarch64 darwin libs #79

merged 9 commits into from
Sep 18, 2022

Conversation

atoulme
Copy link
Contributor

@atoulme atoulme commented Sep 5, 2022

Signed-off-by: Antoine Toulme [email protected]

@atoulme atoulme force-pushed the separate_darwin_paths branch from 26cae3f to 7caf864 Compare September 5, 2022 08:25
@atoulme
use darwin separate folders
658a2e7 
Signed-off-by: Antoine Toulme <[email protected]>
@atoulme atoulme force-pushed the separate_darwin_paths branch from 209d503 to 658a2e7 Compare September 14, 2022 05:46
@atoulme
wip
6496e52 
Signed-off-by: Antoine Toulme <[email protected]>
@atoulme
build on aarch64
84007b5 
Signed-off-by: Antoine Toulme <[email protected]>
@atoulme
add debug
41eb2b8 
Signed-off-by: Antoine Toulme <[email protected]>
@atoulme
detect arm first
cb627fe 
Signed-off-by: Antoine Toulme <[email protected]>
@atoulme
fix build
06df9e2 
Signed-off-by: Antoine Toulme <[email protected]>
@atoulme atoulme force-pushed the separate_darwin_paths branch from b9f0b1d to 06df9e2 Compare September 16, 2022 05:43
@atoulme
don't build dylib on linux
1a63c45 
Signed-off-by: Antoine Toulme <[email protected]>
shemnon
shemnon approved these changes Sep 16, 2022
View reviewed changes
Copy link
Contributor

@shemnon shemnon left a comment

Choose a reason for hiding this comment

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

Looks good for the most part.

Except that the Blake2F lib performs worse than the Java lib right now on mac. Performance is out of scope for this PR.

garyschulte
garyschulte reviewed Sep 17, 2022
View reviewed changes
Copy link
Contributor

@garyschulte garyschulte left a comment

Choose a reason for hiding this comment

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

Are we not able to build a lipo/multi-arch darwin lib for blake2f in the same way we do for the other besu-native libs?

@atoulme
Copy link
Contributor Author

atoulme commented Sep 18, 2022

jna now uses separate folders for darwin, so you can't use a multi-arch lib.
And blake2bf has some ever so slightly differences in imports between m1 and arm, and required a change in the code for imports. You can probably reconcile and use a precompile condition like ifdef __APPLE__. I picked that up a bit late.

@atoulme
remove exception throw
cc499bb 
Signed-off-by: Antoine Toulme <[email protected]>
@atoulme
Copy link
Contributor Author

atoulme commented Sep 18, 2022

I have verified locally that the m1 lib for ipa-multipoint now loads properly with the zulu java 17 SDK.

@atoulme atoulme merged commit 57dc1d4 into hyperledger:main Sep 18, 2022
@shemnon shemnon mentioned this pull request Sep 21, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@garyschulte garyschulte garyschulte left review comments

@shemnon shemnon shemnon 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.
3 participants
@atoulme @shemnon @garyschulte