Cross compilation fixes (march 2020) #81858
Merged
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 no longer needed. elfutils compiles out of the box!
This is needed for some scripts needed at build time.
libxslt is actually both a target and native build input because some libxslt binary is needed to generate files and the built binaries also link against libxslt.
glib is both a native and target dependency. Some binary from glib is used to generate files.
This avoids pulling them in when tests are disabled.
Cross needs some extra native tools: - glib - wayland - orc - glib is needed in nativeBuildInputs Also: - bash-completion needs to be available for PKG_CONFIG_PATH
these are all libraries.
Needed on the build machine
Needed on the build machine
matthewbauer
changed the title
ofborg
bot
added
6.topic: GNOME
Ericson2314
reviewed
Mar 6, 2020
|
Should this go to staging? |
This is needed for cross because gcrypt-config is not available to execute. It’s safe to do otherwise as well though.
Unfortunately, CMake looks in CMAKE_PREFIX_PATH for binaries when cross-compiling. This means that it will use gettext from CMAKE_PREFIX_PATH even when we provide a gettext binary in PATH! This is bad because the on in CMAKE_PREFIX_PATH is for the cross system, not the native one. The only documented way I can find to change this behavior is by manually setting the CMAKE_IGNORE_PATH variable.
This is needed for build tools.
Some build tools are needed for code gen.
Some build tools are needed from here
Needed for some build tools in glib
Needed for some build tool
This is only needed on the builder, no need to cross compile it.
- only set host when cross compiling - use top-level configureFlags and installFlags instead of putting it in the pre configure.
some of these only need to be on the build machine.
matthewbauer
force-pushed
the
mb-cross-fixes-march-2020
branch
from
5e67432
to
1265615
Compare
Maybe although ideally i could split out the mass rebuild commits from the less significant commits. |
|
staging iterates quite fast and I don't think these expressions get touched that often. |
ttuegel
approved these changes
Mar 8, 2020
jtojnar
reviewed
Mar 8, 2020
Co-Authored-By: Jan Tojnar <jtojnar@gmail.com>
makes it more clear why this happens Co-Authored-By: Jan Tojnar <jtojnar@gmail.com>
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.
Motivation for this change
These changes are spun off from my branch at https://github.com/matthewbauer/nixpkgs/tree/kiosk. These should be safe changes for master (versus my other branch that has some more questionable cross fixes).
Mostly the changes are variants of:
Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)