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

[metrohash] support Android triplet build #15715

Merged
merged 6 commits into from
Feb 2, 2021
Merged

[metrohash] support Android triplet build #15715

merged 6 commits into from
Feb 2, 2021

Conversation

luncliff
Copy link
Contributor

What does your PR fix?

My team was using this library. Recently we found that build on Android reported errors for arch-specific intrinsic usage.
This PR updates portfile.cmake and CMakeLists.txt to check variable ANDROID and handle the case.

CONTROL file is changed to vcpkg.json with new "port-version".

Which triplets are supported/not supported?

The following triplets should become available when the user followed docs/users/android.md correctly.

  • arm-android
  • arm64-android
  • x86-android
  • x64-android

Does your PR follow the maintainer guide?

Wish conversion from CONTROL to vcpkg.json was correct :)

@luncliff
Copy link
Contributor Author

Seems like I made a mistake with version JSON file. Will update it again after fixing x64-osx build.

@JackBoosY JackBoosY added category:community-triplet A PR or issue related to community triplets not officially validated by the vcpkg team. category:port-feature The issue is with a library, which is requesting new capabilities that didn’t exist labels Jan 18, 2021
NancyLi1013
NancyLi1013 suggested changes Jan 18, 2021
View reviewed changes
@NancyLi1013
Copy link
Contributor

Need to run vcpkg.exe x-add-version metrohash to solve version check on x86-windows.

Found the following errors:
Error: While reading versions for port metrohash from file: C:\a\1\s\versions\m-\metrohash.json
       File declares version `1.1.3#2` with SHA: 0c764c9b22fa64b5194e65f69bfb28bc47dc20fc
       But local port with the same verion has a different SHA: fdf6869318d7d54c92233f005a39316f344a1536
       Please update the port's version fields and then run:

           vcpkg x-add-version metrohash

       to add a new version.

@NancyLi1013 NancyLi1013 added info:reviewed Pull Request changes follow basic guidelines and removed requires:author-response labels Jan 27, 2021
@ras0219-msft ras0219-msft merged commit 3b4a4e4 into microsoft:master Feb 2, 2021
@ras0219-msft
Copy link
Contributor

LGTM, thanks for the improvement!

@luncliff luncliff mentioned this pull request Feb 4, 2021
Merged
3 tasks
@luncliff luncliff mentioned this pull request Mar 5, 2021
Merged
@luncliff luncliff deleted the android/metrohash branch March 29, 2021 08:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@NancyLi1013 NancyLi1013 NancyLi1013 approved these changes

Assignees

@NancyLi1013 NancyLi1013

Labels
category:community-triplet A PR or issue related to community triplets not officially validated by the vcpkg team. category:port-feature The issue is with a library, which is requesting new capabilities that didn’t exist info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@luncliff @NancyLi1013 @ras0219-msft @JackBoosY