fix(main/fish): rename tarball version file to avoid conflict with NDK internal version file #22056
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Progress on #21130
Fixes
/home/builder/.termux-build/fish/src/version:1:1: error: expected unqualified-idin build offishpackage.This seems to be a completely independent issue from most other issues because it is reproducible in a clean repo using this command:
but I did not create a separate issue since it has not yet been marked as fixed in #21130.
I also tried temporarily unapplying the line
grep -lrw $_TERMUX_TOOLCHAIN_TMPDIR/sysroot/usr/include/c++/v1 -e '<version>' | xargs -n 1 sed -i 's/<version>/\"version\"/g'from the end oftermux_setup_toolchain_27b.shand deleting the~/.termux-build/_cachein case it made any difference, but at least in my test, it did not seem to make a difference on thefishpackage (whether or not#include "version"or#include <version>is forced in the toolchain) so, it seems like thefishpackage itself has to be patched.