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

Adding CMake ABI support for armv5el and armv5hf architecture #7730

Merged

Conversation

kuklinistvan
Copy link
Contributor

@kuklinistvan kuklinistvan commented Sep 21, 2020

Changelog: BugFix: Add armv5hf and armv5el to the Android ABI architectures.
Docs: Omit

Makes CMake support compiling for older Android ARM CPU by mapping armv5el and armv5hf architectures to the armeabi ABI. Without this, CMake is going to complain for an unknown ABI when arch is set to armv5el or armv5hf in the Conan profile, as CMake expects CMAKE_ANDROID_ARCH_ABI to be set to one of the values documented here.

  • Refer to the issue that supports this Pull Request.
  • If the issue has missing info, explain the purpose/use case/pain/need that covers this Pull Request.
  • I've read the Contributing guide.
  • I've followed the PEP8 style guides for Python code.
  • I've opened another PR in the Conan docs repo to the develop branch, documenting this one. (no interface was changed)

I have skipped most of the above steps because this is such a tiny modification that even this pull request contains more work already than those two lines added to the mapping function (maybe not if we count using the modification version) :)

@CLAassistant
Copy link

CLAassistant commented Sep 21, 2020

CLA assistant check
All committers have signed the CLA.

@kuklinistvan kuklinistvan changed the title Feature/old droids arm5el hf Adding CMake ABI support for armv5el and armv5hf architecture Sep 21, 2020
@kuklinistvan kuklinistvan changed the title Adding CMake ABI support for armv5el and armv5hf architecture Adding CMake ABI support for armv5el and armv5hf architecture Sep 21, 2020
Copy link
Member

@memsharded memsharded left a comment

Thanks for fixing this, looks good! I will add a unit test later.

@memsharded memsharded added this to the 1.30 milestone Sep 23, 2020
@memsharded memsharded merged commit 2d3caf9 into conan-io:develop Sep 23, 2020
2 checks passed
@memsharded
Copy link
Member

memsharded commented Sep 23, 2020

Added unit test in: 63b44ec

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.

None yet

3 participants