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

libjpeg_turbo: apply cmake patch for darwin #105886

Merged
merged 1 commit into from Dec 4, 2020
Merged

libjpeg_turbo: apply cmake patch for darwin #105886

merged 1 commit into from Dec 4, 2020

Conversation

FRidh
Copy link
Member

@FRidh FRidh commented Dec 4, 2020 •
edited

There is a regression with 3.19.1 which, for so far we've noticed, only
affects this package and on Darwin. To avoid a mass-rebuild right now,
we patch cmake only for darwin and this package.

Motivation for this change

Fixes #105854

cc @vcunat @colemickens @mweinelt @SuperSandro2000

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-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.

@FRidh FRidh added 6.topic: darwin Running or building packages on Darwin 1.severity: blocker labels Dec 4, 2020
@FRidh FRidh mentioned this pull request Dec 4, 2020
Merged
10 tasks
@SuperSandro2000
Copy link
Member

@FRidh please fix the eval issue. I can build it on darwin after that.

@FRidh
Copy link
Member Author

FRidh commented Dec 4, 2020

Done

@mweinelt
Copy link
Member

mweinelt commented Dec 4, 2020

The cmake issue is https://gitlab.kitware.com/cmake/cmake/-/issues/21553.

@FRidh
libjpeg_turbo: apply cmake patch for darwin
9d00c3f 
There is a regression with 3.19.1 which, for so far we've noticed, only
affects this package and on Darwin. To avoid a mass-rebuild right now,
we patch cmake only for darwin and this package.

Fixes NixOS#105854
@FRidh FRidh changed the title libjpeg_turbo: use cmake 3.19.0 on darwin libjpeg_turbo: apply cmake patch for darwin Dec 4, 2020
@FRidh
Copy link
Member Author

FRidh commented Dec 4, 2020

@SuperSandro2000 using a patch now instead. Could you test?

@SuperSandro2000
Copy link
Member

Building with the old cmake version did not succeed:

CMake Warning:
  Manually-specified variables were not used by the project:

    BUILD_TESTING
    CMAKE_CXX_COMPILER
    CMAKE_EXPORT_NO_PACKAGE_REGISTRY
    CMAKE_FIND_USE_PACKAGE_REGISTRY
    CMAKE_FIND_USE_SYSTEM_PACKAGE_REGISTRY


-- Build files have been written to: /private/var/folders/r4/k85s52jx3555ckj0wty615s00000gp/T/nix-build-libjpeg-turbo-2.0.6.drv-0/source/build
cmake: enabled parallel building
building
build flags: -j4 -l4 SHELL=/nix/store/pmmh1dl7kmxi2xpagknl9qqa4wr7vv9c-bash-4.4-p23/bin/bash
Scanning dependencies of target wrjpgcom
Scanning dependencies of target simd
Scanning dependencies of target rdjpgcom
[  1%] Building C object CMakeFiles/wrjpgcom.dir/wrjpgcom.c.o
[  1%] Building ASM_NASM object simd/CMakeFiles/simd.dir/x86_64/jsimdcpu.asm.o
[  2%] Building C object CMakeFiles/rdjpgcom.dir/rdjpgcom.c.o
x86_64: fatal: more than one input file specified: /private/var/folders/r4/k85s52jx3555ckj0wty615s00000gp/T/nix-build-libjpeg-turbo-2.0.6.drv-0/source/simd/x86_64/jsimdcpu.asm

make[2]: *** [simd/CMakeFiles/simd.dir/build.make:87: simd/CMakeFiles/simd.dir/x86_64/jsimdcpu.asm.o] Error 1
make[1]: *** [CMakeFiles/Makefile2:562: simd/CMakeFiles/simd.dir/all] Error 2
make[1]: *** Waiting for unfinished jobs....
[  3%] Linking C executable wrjpgcom
[  4%] Linking C executable rdjpgcom
[  4%] Built target wrjpgcom
[  4%] Built target rdjpgcom
make: *** [Makefile:160: all] Error 2
builder for '/nix/store/43rpa3c2qfb5w6xrfzpxxw91y399d48p-libjpeg-turbo-2.0.6.drv' failed with exit code 2
error: build of '/nix/store/43rpa3c2qfb5w6xrfzpxxw91y399d48p-libjpeg-turbo-2.0.6.drv' failed
┏━ Currently building:

@SuperSandro2000
Copy link
Member

@FRidh patch works on for libjpeg_turbo.

@FRidh FRidh merged commit 5524c43 into NixOS:staging-next Dec 4, 2020
@FRidh
Copy link
Member Author

FRidh commented Dec 4, 2020

Thanks!

@FRidh FRidh deleted the libjpeg_turbo branch December 4, 2020 18:03
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
1.severity: blocker 6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 501+ 10.rebuild-darwin: 2501-5000 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@FRidh @SuperSandro2000 @mweinelt