-
-
Notifications
You must be signed in to change notification settings - Fork 3.2k
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
fix(main/fish): rename tarball version file to avoid conflict with NDK internal version file #22056
fix(main/fish): rename tarball version file to avoid conflict with NDK internal version file #22056
Conversation
I tried to check what other distros do for this, since I don't understand why this started happening if
It would be great to find the true root cause by finding whether there are any distros in which this include order of
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It would be good if you could test if this is still an issue when building against the 27c toolchain, though I suspect it is.
I think in the meantime this is a sensible workaround until we can rootcause and solve the issue more "properly."
Edit: Yep just checked, still occurs with 27c.
d5129cd
to
299ee7d
Compare
…K internal version file Progress on termux#21130 This seems to be a completely independent issue from other issues because it is reproducible in a clean repo using this command: ``` scripts/run-docker.sh ./build-package.sh -I fish ``` 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 of `termux_setup_toolchain_27b.sh` and deleting the `~/.termux-build/_cache` in case it made any difference, but at least in my test, it does not seem to make a difference on the fish package (whether or not `#include "version"` or `include <version>` is forced in the toolchain) so, it seems like the `fish` package itself has to be patched.
299ee7d
to
7701e73
Compare
Progress on #21130
Fixes
/home/builder/.termux-build/fish/src/version:1:1: error: expected unqualified-id
in build offish
package.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.sh
and deleting the~/.termux-build/_cache
in case it made any difference, but at least in my test, it did not seem to make a difference on thefish
package (whether or not#include "version"
or#include <version>
is forced in the toolchain) so, it seems like thefish
package itself has to be patched.