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

krita: refactor to fix build on aarch64 #45906

Merged
merged 1 commit into from Sep 1, 2018
Merged

krita: refactor to fix build on aarch64 #45906

merged 1 commit into from Sep 1, 2018

Conversation

Thra11
Copy link
Member

@Thra11 Thra11 commented Sep 1, 2018

An optional dependency, Vc, doesn't currently provide any optimisations
on aarch64 and causes a build failure in krita. Exclude it from the
build inputs on arm and aarch64.

Motivation for this change

Krita doesn't build on aarch64. Neon support in Vc is listed as 'in development', so it's not clear whether Vc currently offers any benefits on these platforms anyway.

Things done

Excluded vc from the build inputs on arm and aarch64. As it is an optional dependency, this means that cmake doesn't find it, Vc support is disabled, and the build succeeds. Other platforms should be unaffected.

  • 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)
  • Fits CONTRIBUTING.md.

@Thra11
krita: refactor to fix build on aarch64
d6e5be0 
An optional dependency, Vc, doesn't currently provide any optimisations
on aarch64 and causes a build failure in krita. Exclude it from the
build inputs on arm and aarch64.
@Thra11
Copy link
Member Author

Thra11 commented Sep 1, 2018

cc @abbradar

@xeji
Copy link
Contributor

xeji commented Sep 1, 2018

@GrahamcOfBorg build krita

@GrahamcOfBorg
Copy link

No attempt on x86_64-darwin (full log)

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

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

Success on x86_64-linux (full log)

Attempted: krita

Partial log (click to expand)

shrinking /nix/store/fvm80s2dl3fh8pf3d16nj5jv5fcby3i3-krita-4.1.1/lib/libkritatextlayout.so.17.0.0
shrinking /nix/store/fvm80s2dl3fh8pf3d16nj5jv5fcby3i3-krita-4.1.1/lib/libkritaimpex.so.17.0.0
shrinking /nix/store/fvm80s2dl3fh8pf3d16nj5jv5fcby3i3-krita-4.1.1/lib/libkritavectorimage.so.17.0.0
shrinking /nix/store/fvm80s2dl3fh8pf3d16nj5jv5fcby3i3-krita-4.1.1/lib/libkritaplugin.so.17.0.0
shrinking /nix/store/fvm80s2dl3fh8pf3d16nj5jv5fcby3i3-krita-4.1.1/lib/libkritalibpaintop.so.17.0.0
strip is /nix/store/h0lbngpv6ln56hjj59i6l77vxq25flbz-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/fvm80s2dl3fh8pf3d16nj5jv5fcby3i3-krita-4.1.1/lib  /nix/store/fvm80s2dl3fh8pf3d16nj5jv5fcby3i3-krita-4.1.1/bin
patching script interpreter paths in /nix/store/fvm80s2dl3fh8pf3d16nj5jv5fcby3i3-krita-4.1.1
checking for references to /build in /nix/store/fvm80s2dl3fh8pf3d16nj5jv5fcby3i3-krita-4.1.1...
postPatchMkspecs

@GrahamcOfBorg
Copy link

Timed out, unknown build status on aarch64-linux (full log)

Attempted: krita

Partial log (click to expand)

[ 56%] Generating ui_kis_wdg_options_tiff.h
Scanning dependencies of target kritaasccdl
[ 56%] Building CXX object plugins/filters/unsharp/CMakeFiles/kritaunsharpfilter.dir/unsharp.cpp.o
[ 56%] Building CXX object plugins/filters/threshold/CMakeFiles/kritathreshold.dir/threshold.cpp.o
Scanning dependencies of target kritacolorgenerator
[ 56%] Building CXX object plugins/filters/asccdl/CMakeFiles/kritaasccdl.dir/kis_asccdl_filter.cpp.o
[ 56%] Building CXX object plugins/generators/solid/CMakeFiles/kritacolorgenerator.dir/colorgenerator.cpp.o
Scanning dependencies of target kritaphongbumpmap
building of '/nix/store/jqn80hrs49vvgngcl3ji896if1lw1h8q-krita-4.1.1.drv' timed out after 3600 seconds
error: build of '/nix/store/jqn80hrs49vvgngcl3ji896if1lw1h8q-krita-4.1.1.drv' failed

@vcunat
Copy link
Member

vcunat commented Sep 1, 2018 •
edited

I had built this commit on the community aarch64 machine. (Borg didn't pick it up presumably because a staging-next merge in-between.)

@xeji
Copy link
Contributor

xeji commented Sep 1, 2018

Fine then.

@xeji xeji merged commit ef21e94 into NixOS:master Sep 1, 2018
@Thra11 Thra11 deleted the krita-aarch64 branch September 1, 2018 20:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@Thra11 @xeji @GrahamcOfBorg @vcunat