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

[vcpkg script] Add support for Android to make and meson #26570

Closed
wants to merge 12 commits into from

Conversation

m-kuhn
Copy link
Contributor

@m-kuhn m-kuhn commented Aug 28, 2022

Builds on top of #21847

Time to rebuild the world once again

CC @holmesconan

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

PRs must add only one version and must not modify any published versions

When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.

error: checked-in files for vcpkg-cmake-get-vars have changed but the version was not updated
version: 2022-05-10#1
old SHA: b50ca3d20736304215fbd82c102d4552457255bb
new SHA: 8b0c36b0d267841b8502558b0dc75f8528f12d1f
Did you remember to update the version or port version?
Use --overwrite-version to bypass this check
***No files were updated***

github-actions[bot]
github-actions bot previously approved these changes Aug 28, 2022
@m-kuhn m-kuhn marked this pull request as draft August 28, 2022 17:26
@m-kuhn m-kuhn changed the title Add support for Android to vcpkg_configure_make [vcpkg script] Add support for Android to vcpkg_configure_make Aug 28, 2022
@m-kuhn m-kuhn marked this pull request as ready for review August 28, 2022 19:53
@JonLiu1993 JonLiu1993 self-assigned this Aug 29, 2022
@JonLiu1993 JonLiu1993 added the category:port-feature The issue is with a library, which is requesting new capabilities that didn’t exist label Aug 29, 2022
ports/vcpkg-cmake-get-vars/vcpkg.json Outdated Show resolved Hide resolved
github-actions[bot]
github-actions bot previously approved these changes Aug 29, 2022
@m-kuhn
Copy link
Contributor Author

m-kuhn commented Aug 29, 2022

@JonLiu1993 what kind of changes are still requested?

github-actions[bot]
github-actions bot previously approved these changes Aug 29, 2022
@JonLiu1993
Copy link
Member

@JonLiu1993 what kind of changes are still requested?

@m-kuhn, No need to request changes for now, I'm just waiting for the test results from ci.

@m-kuhn
Copy link
Contributor Author

m-kuhn commented Aug 30, 2022

Unrelated failure fixed in #26564

@JonLiu1993 JonLiu1993 requested a review from JackBoosY August 30, 2022 05:47
@JonLiu1993 JonLiu1993 added depends:different-pr This PR or Issue depends on a PR which has been filed category:vcpkg-feature The issue is a new capability of the tool that doesn’t already exist and we haven’t committed and removed category:port-feature The issue is with a library, which is requesting new capabilities that didn’t exist labels Aug 31, 2022
github-actions[bot]
github-actions bot previously approved these changes Sep 10, 2022
github-actions[bot]
github-actions bot previously approved these changes Sep 10, 2022
github-actions[bot]
github-actions bot previously approved these changes Sep 10, 2022
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

PRs must add only one version and must not modify any published versions

When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.

error: checked-in files for vcpkg-cmake-get-vars have changed but the version was not updated
version: 2022-08-28
old SHA: ace9b3e66bfd3fc51e7837248a340fbad446fe65
new SHA: 7e553bacbf36f1404249e24bc25340056a79e897
Did you remember to update the version or port version?
Use --overwrite-version to bypass this check
***No files were updated***

github-actions[bot]
github-actions bot previously approved these changes Sep 13, 2022
@m-kuhn
Copy link
Contributor Author

m-kuhn commented Sep 14, 2022

#26780 (comment)

@JackBoosY JackBoosY added the depends:different-pr This PR or Issue depends on a PR which has been filed label Sep 14, 2022
@holmesconan
Copy link

@m-kuhn It's nice for you still doing the effort to merge the patch. Hope you could complete this time.

@Neumann-A
Copy link
Contributor

should i integrate this into #26617? this and #26617 won't be merged unless the baseline is clean which probably will take a few more days.

@JackBoosY
Copy link
Contributor

should i integrate this into #26617? this and #26617 won't be merged unless the baseline is clean which probably will take a few more days.

I think that's okay.

Neumann-A added a commit to Neumann-A/vcpkg that referenced this pull request Sep 14, 2022
@m-kuhn m-kuhn closed this Sep 14, 2022
vicroms pushed a commit that referenced this pull request Oct 13, 2022
* test osx stuff

* deactivate most of ci

* get trace output

* add required flags to the linker flags

* also look for --sysroot

* Link_args are always shared

* fix ar flags

* setup FOR_BUILD vars.

* try tricking the build.... but man configure scripts are stupid sometimes...

* try 2

* major meson rewrite

* fix duplicates

* revert --trace-expand

* update port version

* revert pipeline changes

* v db

* bump version

* v db

* set flags for rc compilers

* a few more ios fixes.

* v db

* fix osx/ios logic

* documentation and don't fatal_error in build/host machine entry calculation.

* add android/compiler target stuff from #26570

* remove extra endif

* v db

* add target param to linker flags.

* target in cpp flags

* Make vcpkg-cmake-get-vars more ios compatible

* Update scripts/get_cmake_vars/CMakeLists.txt

Co-authored-by: Matthias Kuhn <[email protected]>

* More ios fixes

* fix target adding

* Fix broken loop

* v db

* v db

* bump date

* v db

* v db

* v db

* remove port-version 1

* v db

Co-authored-by: JackBoosY <[email protected]>
Co-authored-by: Matthias Kuhn <[email protected]>
@m-kuhn m-kuhn deleted the android branch November 22, 2023 09:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:vcpkg-feature The issue is a new capability of the tool that doesn’t already exist and we haven’t committed depends:different-pr This PR or Issue depends on a PR which has been filed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

New Android NDK support request
6 participants