Skip to content

fix: use patch rather than git for patching the vendored modules#2

Merged
Biswa96 merged 1 commit into
termux:masterfrom
PureTryOut:patch
Aug 4, 2025
Merged

fix: use patch rather than git for patching the vendored modules#2
Biswa96 merged 1 commit into
termux:masterfrom
PureTryOut:patch

Conversation

@PureTryOut

Copy link
Copy Markdown
Contributor

This way distro build systems don't need to setup git (user.email and user.name).

@Biswa96

Biswa96 commented Aug 4, 2025

Copy link
Copy Markdown
Member

I added git am command following the cmake files in nmeum/android-tools project. It helps me to track changes in separate patches and upstream them. Would it be possible to add a cmake option to choose between patch and git am command? for example, ANDROID_BUILD_TOOLS_DEV_MODE or similar.

This way distro build systems don't need to setup git (`user.email` and
`user.name`).
@PureTryOut

Copy link
Copy Markdown
Contributor Author

If it makes upstreaming easier then always 😄 Added an option for it.

@Biswa96

Biswa96 commented Aug 4, 2025

Copy link
Copy Markdown
Member

would it be possible to move the option declaration in vendor/CMakeLists.txt after the previous option line?

@PureTryOut

Copy link
Copy Markdown
Contributor Author

It would but as a distro packager I can say from experience that I much rather have projects defining all possible build options in a single place so they're easy to find and hard to miss. I find it annoying to have options that modify the build scattered throughout several files, in practice that just means I miss them and am missing out on a lot of configuration.

@Biswa96

Biswa96 commented Aug 4, 2025

Copy link
Copy Markdown
Member

Oh, I agree with that point. I'll move the other two options after it in next commit.

@Biswa96 Biswa96 merged commit dab2b86 into termux:master Aug 4, 2025
4 checks passed
@PureTryOut PureTryOut deleted the patch branch August 4, 2025 14:08
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