texlive.bin.core{,-big}: fix cross compilation#223303
Merged
veprbl merged 2 commits intoNixOS:stagingfrom Apr 6, 2023
Merged
Conversation
xworld21
reviewed
Mar 26, 2023
843f6ec to
4d47663
Compare
13 tasks
ghost
reviewed
Apr 6, 2023
ghost
left a comment
There was a problem hiding this comment.
LGTM other than the issues pointed out below.
The build system generates the file "hitables.c" with the program "./himktables" that is also compiled by the build system. This does not work when cross-compiling since this program is built for the wrong architecture. We already use a natively built copy of texlive.bin.core for various other tools (like tangle, weave), so this change just adds himktables to the this native copy and uses this program in the cross build.
4d47663 to
089675b
Compare
|
@ofborg build pkgsCross.aarch64-multiplatform.texlive.bin |
|
@ofborg build texlive |
ghost
approved these changes
Apr 6, 2023
ghost
left a comment
There was a problem hiding this comment.
It's been a long long time since I used TeX. However:
I verified with nix-diff that the only change to the native-compile drv is adding a new output (dev) and two lines of postInstall that populate that new output.
So the risk of breakage here is very small.
If ofborg succeeds with the two builds I asked it to do, I intend to merge this.
Contributor
Author
|
(The cross builds of texlive.bin.latexindent, texlive,bin.xdvi and texlive.bin.biber still fail. This PR only fixes core and core-big. Updating the title to reflect that. I'll look into the others tomorrow.) |
This was referenced Apr 6, 2023
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Description of changes
This (hopefully) fixes cross compilation of texlive.bin.core and texlive.bin.core-big.
I tested execution of some binaries on aarch64-linux built on x86_64-linux.
Things done
sandbox = trueset innix.conf? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)