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.

Sign up for GitHub

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

Jump to bottom

cctools, apple libiconv: Apple clean up for iOS cross #39844

Merged
merged 2 commits into from
May 2, 2018
Merged

cctools, apple libiconv: Apple clean up for iOS cross #39844

merged 2 commits into from
May 2, 2018
+8 −10

Conversation

Ericson2314
Copy link
Member

Motivation for this change

One one hand, this is an "incomplete" mass-rebuild as more changes are needed. OTOH it's nice to upstream things as soon as possible before I forget. LMK what you all think.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-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/)
  • Fits CONTRIBUTING.md.

CC @ElvishJerricco

Sorry, something went wrong.

@Ericson2314
cctools: Cleanup useOld conditions slightly
4b3cc9e 
60771af jumped through some hoops in
order to avoid a mass-rebuild.
Ericson2314
Ericson2314 commented May 2, 2018
View reviewed changes
pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix
@@ -1,14 +1,14 @@
{ stdenv, appleDerivation }:
{ stdenv, appleDerivation, autoreconfHook }:
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I haven't yet been able to get autoreconfHook to work :/, but I think it's needed as the ...-ios triples are new.

@GrahamcOfBorg
Copy link

No attempt on aarch64-linux (full log)

The following builds were skipped because they don't evaluate on aarch64-linux: darwin.libiconv

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnsupportedSystem = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnsupportedSystem = true; }
to ~/.config/nixpkgs/config.nix.

@GrahamcOfBorg
Copy link

No attempt on x86_64-linux (full log)

The following builds were skipped because they don't evaluate on x86_64-linux: darwin.libiconv

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnsupportedSystem = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnsupportedSystem = true; }
to ~/.config/nixpkgs/config.nix.

matthewbauer
matthewbauer approved these changes May 2, 2018
View reviewed changes
Copy link
Member

@matthewbauer matthewbauer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good! I was actually just looking at ccports because I couldn't find the man page for otool and found tpoechtrager/cctools-port#40.

pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix Outdated

appleDerivation {
preConfigure = "cd libiconv";
postPatch = "cd libiconv";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably safer to do this:

postUnpack = "sourceRoot=$sourceRoot/libiconv";

@Ericson2314
darwin.libiconv: Start to fix for cross
62fd669 
I think I need postPatch for `autoreconfHook`, it's better anyways, and
I'm pairing this with another mass-rebuild so its essentially free.
@Ericson2314
Copy link
Member Author

Ericson2314 commented May 2, 2018 •
edited
Loading

@matthewbauer fair point; that worked. And good luck with that issue if you tackle it.

I really need to head home but anyone feel free to merge this after ofborg then.

@GrahamcOfBorg
Copy link

No attempt on aarch64-linux (full log)

The following builds were skipped because they don't evaluate on aarch64-linux: darwin.libiconv

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnsupportedSystem = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnsupportedSystem = true; }
to ~/.config/nixpkgs/config.nix.

@GrahamcOfBorg
Copy link

No attempt on x86_64-linux (full log)

The following builds were skipped because they don't evaluate on x86_64-linux: darwin.libiconv

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnsupportedSystem = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnsupportedSystem = true; }
to ~/.config/nixpkgs/config.nix.

@GrahamcOfBorg
Copy link

Failure on x86_64-darwin (full log)

Attempted: darwin.libiconv

Partial log (click to expand)

cannot build derivation '/nix/store/jjhdc535xy0mx59rhlqwn7728ak2ggs0-hook.drv': 6 dependencies couldn't be built
cannot build derivation '/nix/store/yjnw1fzi3hwc242vmfli0brac7kwnjvc-ICU-osx-10.10.5.drv': 3 dependencies couldn't be built
cannot build derivation '/nix/store/c44ivqmfbi6cwv3akczkfswq93hdyk2v-cctools-binutils-darwin.drv': 4 dependencies couldn't be built
cannot build derivation '/nix/store/ad6aagi1bi2rnqkgmvismhsch4bjgg64-gnutar-1.30.drv': 3 dependencies couldn't be built
cannot build derivation '/nix/store/03n5b76lasw6v72c1jadxcykyjajhd8x-CF-osx-10.10.5.drv': 7 dependencies couldn't be built
cannot build derivation '/nix/store/zq3fzbyqqjhgavsfwvj2p99dnigp1wva-cctools-binutils-darwin-wrapper.drv': 7 dependencies couldn't be built
cannot build derivation '/nix/store/zqz0hhg951lg73qj8dvj3p7j53953jh3-clang-wrapper-5.0.1.drv': 9 dependencies couldn't be built
cannot build derivation '/nix/store/zyb6fn5560psjglc4ng7swnxrhh1pbjf-stdenv-darwin.drv': 35 dependencies couldn't be built
cannot build derivation '/nix/store/wva96y7sdzckf67zr73l4cjv0i3chdim-libiconv-osx-10.11.6.drv': 2 dependencies couldn't be built
error: build of '/nix/store/wva96y7sdzckf67zr73l4cjv0i3chdim-libiconv-osx-10.11.6.drv' failed

@GrahamcOfBorg
Copy link

Failure on x86_64-darwin (full log)

Attempted: darwin.libiconv

Partial log (click to expand)

cannot build derivation '/nix/store/zf9pr8j9g87qzhzhbn12yh2y5avfyc8j-hook.drv': 6 dependencies couldn't be built
cannot build derivation '/nix/store/zk9xzsbimandp2r4w3z9mll2g5mvfk6z-ICU-osx-10.10.5.drv': 3 dependencies couldn't be built
cannot build derivation '/nix/store/vs7z45i0ja7jbrhf2nbsziz72xnjymr6-cctools-binutils-darwin.drv': 4 dependencies couldn't be built
cannot build derivation '/nix/store/11a2yrxky8dd4kslp0qpjn33zdngj80l-gnutar-1.30.drv': 3 dependencies couldn't be built
cannot build derivation '/nix/store/zk47kilrj5dgwlajhpcbi21kskj787y6-CF-osx-10.10.5.drv': 7 dependencies couldn't be built
cannot build derivation '/nix/store/h5qvzkwixy89cvc1wxa1wmy8mhc68a8a-cctools-binutils-darwin-wrapper.drv': 7 dependencies couldn't be built
cannot build derivation '/nix/store/chcxwrxdgfdh730qmp6j9arbwb42njmn-clang-wrapper-5.0.1.drv': 9 dependencies couldn't be built
cannot build derivation '/nix/store/achp0ml4qi1dzph5j1k1f3wakq7dqk1g-stdenv-darwin.drv': 35 dependencies couldn't be built
cannot build derivation '/nix/store/pbp1iqlpdx1pw103xxz8ds8vb5k8sd1f-libiconv-osx-10.11.6.drv': 2 dependencies couldn't be built
�[31;1merror:�[0m build of '/nix/store/pbp1iqlpdx1pw103xxz8ds8vb5k8sd1f-libiconv-osx-10.11.6.drv' failed

@Ericson2314
Copy link
Member Author

I built it locally so whatever re the time out.

@Ericson2314 Ericson2314 merged commit c377b21 into NixOS:staging May 2, 2018
@Ericson2314 Ericson2314 deleted the cctools-cleanup branch May 2, 2018 13:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@matthewbauer matthewbauer

@dtzWill dtzWill

Assignees
No one assigned
Labels
10.rebuild-darwin: 501+ 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@Ericson2314 @GrahamcOfBorg @matthewbauer