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.

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

upgrade erlang to 24.1.2 #7738

Merged
merged 1 commit into from
Oct 27, 2021
Merged

Conversation

ian4hu
Copy link
Contributor

@ian4hu ian4hu commented Oct 14, 2021

No description provided.

Copy link
Member

@thunder-coding thunder-coding left a comment

Choose a reason for hiding this comment

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

Probably you need to link against libgcc or compiler-rt. See https://stackoverflow.com/questions/57756695/android-arm-undefined-reference-to-aeabi-uidiv-clang

Also note that libgcc has been removed from NDK r23

@ian4hu ian4hu changed the title upgrade erlang to 24.1.2 [WIP] upgrade erlang to 24.1.2 Oct 15, 2021
@ian4hu
Copy link
Contributor Author

ian4hu commented Oct 15, 2021

Probably you need to link against libgcc or compiler-rt. See https://stackoverflow.com/questions/57756695/android-arm-undefined-reference-to-aeabi-uidiv-clang

Also note that libgcc has been removed from NDK r23

@thunder-coding I have no idea about compiler-rt, Could you please give some example about use it?

@thunder-coding
Copy link
Member

@ian4hu #7339 has just landed bringing NDK r23. Can you rebase against master to check builds of Erlang?

@ian4hu
Copy link
Contributor Author

ian4hu commented Oct 25, 2021

OK

Copy link
Member

@thunder-coding thunder-coding left a comment

Choose a reason for hiding this comment

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

Probably you need to apply this diff asmjit/asmjit@8ee4c76#diff-1b3ebb13c9d717b8e504ce8b4a23127f51a1ea675589d1863ac00a6fc83c36f0

Note: The path needs to be changed. asmjit is in stored in erts/emulator/asmjit in the Erlang source

@ian4hu ian4hu changed the title [WIP] upgrade erlang to 24.1.2 upgrade erlang to 24.1.2 Oct 26, 2021
@ian4hu
Copy link
Contributor Author

ian4hu commented Oct 26, 2021

Probably you need to apply this diff asmjit/asmjit@8ee4c76#diff-1b3ebb13c9d717b8e504ce8b4a23127f51a1ea675589d1863ac00a6fc83c36f0

Note: The path needs to be changed. asmjit is in stored in erts/emulator/asmjit in the Erlang source

done.

@thunder-coding
Copy link
Member

Just a final review: Can you squash your commits and rebase against master instead of merging the master branch. The CI doesn't like merge commits and there have been problems due to merge commits earlier.

I am ready to merge this then

@ian4hu
Copy link
Contributor Author

ian4hu commented Oct 26, 2021

Just a final review: Can you squash your commits and rebase against master instead of merging the master branch. The CI doesn't like merge commits and there have been problems due to merge commits earlier.

I am ready to merge this then

commits squashed.

@ian4hu ian4hu force-pushed the upgrade-erlang-24.1.2 branch 3 times, most recently from 0e5417e to 1a5fda2 Compare October 26, 2021 12:35
Copy link
Member

@thunder-coding thunder-coding left a comment

Choose a reason for hiding this comment

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

LGTM

@thunder-coding thunder-coding merged commit 7c1cd8a into termux:master Oct 27, 2021
metayan pushed a commit to metayan/termux-packages that referenced this pull request Nov 28, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants