scripts(toolchain): several changes related to $TERMUX_PREFIX/include #23513
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- This is the `$TERMUX_PREFIX/include` portion of termux#21835 - Replace `-I` with `-isystem` in strategic locations: changes the include order of headers in `$TERMUX_PREFIX/include` relative to headers inside the source code of packages currently being built, so that if any headers inside the source code of the package being built have the exact same file names as headers inside `$TERMUX_PREFIX/include`, the headers from inside the source code of the package will be used, instead of the headers from inside `$TERMUX_PREFIX/include`, which would not be correct. - Previous discussion was here https://github.com/termux/termux-packages/pull/22009/files/3dc455672cd67f05ed3cb814da07f7b9cfaf54af#diff-8c775c171f451b21463be103116ad5a4c2d0c54d3fb4ff4b59e987f98fc9c348 - Prevents many _potential_ `$TERMUX_PREFIX/include`-related errors (that are often only reproducible when reusing a single docker container to compile multiple packages) in the following packages (and possibly other packages): - `nasm` - `bitlbee` - `emacs` - `gdb` - `libjxl` - `libmediainfo` - `maxcso` - `nodejs` - `pipewire` - `rust` - `sqlcipher` - `tome2` - `weggli` - `zip` - `proxmark3` - `handbrake` - This include order causes the `$TERMUX_ON_DEVICE_BUILD=false` build codepath to match the behavior of the `clang` binary from the `main/clang` package (i.e. the `$TERMUX_ON_DEVICE_BUILD=true` codepath), which is caused by the `-DDEFAULT_SYSROOT` setting that is built into it: https://github.com/termux/termux-packages/blob/26a76f7b5de02c2b33c7f3d09c841712dfd4ccf0/packages/libllvm/build.sh#L40 - `simulavr`: the current `simulavr` `build.sh` runs `mv $TERMUX_PREFIX/include ...`, that is not really ideal because it effectively deletes the entire `$TERMUX_PREFIX/include` folder, preventing any other packages that might be built in the same container from using the headers they need from `$TERMUX_PREFIX/include` (and also potentially creating a malformed `simulavr` package `.deb` if any other packages were installed info `$TERMUX_PREFIX` beforehand). This rewrites the `simulavr` package in a way that avoids destroying `$TERMUX_PREFIX/include`.
robertkirkman
force-pushed
the
fix-crossbuild-prefix-pollution-include-1
branch
from
6c438c9 to
e2d4c5a
Compare
TomJo2000
approved these changes
Feb 26, 2025
|
Ok, so it seems to be fine. |
This was referenced Feb 26, 2025
This was referenced Mar 10, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This is the
$TERMUX_PREFIX/includeportion of [RFC] fix $TERMUX_PREFIX pollution #21835Replace
-Iwith-isystemin strategic locations: changes the include order of headers in$TERMUX_PREFIX/includerelative to headers inside the source code of packages currently being built, so that if any headers inside the source code of the package being built have the exact same file names as headers inside$TERMUX_PREFIX/include, the headers from inside the source code of the package will be used, instead of the headers from inside$TERMUX_PREFIX/include, which would not be correct.$TERMUX_PREFIX/include-related errors (that are often only reproducible when reusing a single docker container to compile multiple packages) in the following packages (and possibly other packages):nasmbitlbeeemacsgdblibjxllibmediainfomaxcsonodejspipewirerustsqlciphertome2wegglizipproxmark3handbrake$TERMUX_ON_DEVICE_BUILD=falsebuild codepath to match the behavior of theclangbinary from themain/clangpackage (i.e. the$TERMUX_ON_DEVICE_BUILD=truecodepath), which is caused by the-DDEFAULT_SYSROOTsetting that is built into it:termux-packages/packages/libllvm/build.sh
Line 40 in 26a76f7
simulavr: the currentsimulavrbuild.shrunsmv $TERMUX_PREFIX/include ..., that is not really ideal because it effectively deletes the entire$TERMUX_PREFIX/includefolder, preventing any other packages that might be built in the same container from using the headers they need from$TERMUX_PREFIX/include(and also potentially creating a malformedsimulavrpackage.debif any other packages were installed info$TERMUX_PREFIXbeforehand). This rewrites thesimulavrpackage in a way that avoids destroying$TERMUX_PREFIX/include.@xtkoba I know you might not be here, but in case you see this, this would replace some of your code (in
ghostscript) with other code, I would not want to remove your code like this without letting you know what is happening.