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

spidermonkey_{38,60}: fix cross compilation #65758

Merged
merged 3 commits into from Aug 3, 2019

Conversation

@erictapen
Copy link
Contributor

commented Aug 1, 2019

Motivation for this change

Fix cross compilation.

Things done
  • I redid what was done in 65f2b0a for 52, but for 38 and 60.
  • For 38 I also set --enable-posix-nspr-emulation, as it would otherwise complain about a wrong NSPR version and that trick seemed to be successful in 60 anyway.

Also I removed some version bounds on mediatomb and elinks as I didn't manage to cross compile spidermonkey_1_8_5. These two packages still don't cross compile, but i guess this brings them one step further on doing so.

While working on this I figured that we probably don't need that many versions of spidermonkey or that one could at least remove some redundancy be creating a generic.nix. But I guess that should better be done in a separate PR.

#51134 can be closed btw.

  • 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 nix-review --run "nix-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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Notify maintainers

cc @cillianderoiste @abbradar @Phreedom

@erictapen

This comment has been minimized.

Copy link
Contributor Author

commented Aug 1, 2019

@GrahamcOfBorg build spidermonkey_38 spidermonkey_60 elinks mediatomb pkgsCross.aarch64-multiplatform.spidermonkey_38 pkgsCross.aarch64-multiplatform.spidermonkey_60

erictapen added 3 commits Aug 1, 2019
spidermonkey_38, spidermonkey_60: fix cross compilation
This is essentially the same as done in
65f2b0a.

For spidermonkey_38 I set --enable-posix-nspr-emulation, as it would
otherwise complain about a wrong NSPR version and that trick seemed to
be successful in spidermonkey_60 anyway.

@erictapen erictapen force-pushed the erictapen:spidermonkey-fix-cross branch from 0ae8f23 to 002463d Aug 2, 2019

@erictapen

This comment has been minimized.

Copy link
Contributor Author

commented Aug 2, 2019

@GrahamcOfBorg build spidermonkey_38 spidermonkey_60 elinks mediatomb pkgsCross.aarch64-multiplatform.spidermonkey_38 pkgsCross.aarch64-multiplatform.spidermonkey_60

@FRidh FRidh changed the base branch from master to staging Aug 3, 2019

@FRidh FRidh merged commit 4908aaf into NixOS:staging Aug 3, 2019

14 of 15 checks passed

grahamcofborg-eval Cloning project
Details
Evaluation Performance Report Evaluator Performance Report
Details
elinks, mediatomb, spidermonkey_38, spidermonkey_60 on aarch64-linux Success
Details
elinks, mediatomb, spidermonkey_38, spidermonkey_60 on x86_64-linux Success
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A darwin-tested
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release-combined.nix -A tested
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details

@erictapen erictapen deleted the erictapen:spidermonkey-fix-cross branch Aug 3, 2019

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