Skip to content
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

fontconfig: fix FC_ARCHITECTURE to match use elsewhere #54733

Closed
wants to merge 1 commit into from

Conversation

Projects
None yet
3 participants
@dtzWill
Copy link
Contributor

commented Jan 27, 2019

As-is we force it to be something like "x86_64"
instead of "le64" generally used on this platform.

This causes our software to interact badly with software
using the other (default!) values.
Small bonus: all le64 platforms can use same cache, maybe.

Motivation for this change

I'm not sure this was ever intended to be set twice (!)
as we presently are doing, looks like unintended result
of merging in some simplifications re:crossAttrs usage?

Anyway, cross or not, lets set this to the same values
the rest of the Linux world uses so we interop better.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

fontconfig: fix FC_ARCHITECTURE to match use elsewhere
As-is we force it to be something like "x86_64"
instead of "le64" generally used on this platform.

This causes our software to interact badly with software
using the other (default!) values.
Small bonus: all le64 platforms can use same cache, maybe.
@dtzWill

This comment has been minimized.

Copy link
Contributor Author

commented Jan 27, 2019

Would be nice to upgrade to 2.13.1 as well (and review if penultimate is still relevant/correct), but that's perhaps best handled separately...

@dtzWill

This comment has been minimized.

Copy link
Contributor Author

commented Jan 28, 2019

cc @Ericson2314 @ttuegel for previously touching this in relevant ways

littleEndian = "le";
bigEndian = "be";
}."${cpu.significantByte.name}" or (throw "unhandled endianness");
FC_ARCHITECTURE = endian + (toString cpu.bits);

This comment has been minimized.

Copy link
@volth

volth Jan 29, 2019

Contributor

Per the comment above i686 should result to le32d4, but it seems that d4 is lost here

This comment has been minimized.

Copy link
@dtzWill

dtzWill Jan 29, 2019

Author Contributor

... Yes, indeed. Not sure there's a good way to do this then, without adding double alignment to our platform information? Hmm...

@dtzWill

This comment has been minimized.

Copy link
Contributor Author

commented Jan 29, 2019

Closing until the double alignment issue is sorted.

@dtzWill dtzWill closed this Jan 29, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.