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

cmake: 3.11.2 -> 3.12.1 #44910

Merged
merged 5 commits into from Aug 30, 2018
Merged

cmake: 3.11.2 -> 3.12.1 #44910

merged 5 commits into from Aug 30, 2018

Conversation

thefloweringash
Copy link
Member

Motivation for this change

Keeping packages up to date. Additionally I want to use the new (as of 3.12) target_link_libraries() support for Object Libraries in a project.

I assume this will trigger a mass-rebuild, and so should go to staging. Do I rebase on top of current staging (or staging-next) or leave it on top of master?

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

@xeji
Copy link
Contributor

xeji commented Aug 12, 2018

Please rebase this on staging.

What's the reason for keeping 4 different cmake versions? Are they all being used?

@thefloweringash
Copy link
Member Author

From a quick survey:

  • 3.9 is used in Darwin's stdenv bootstrapping with a comment to update the application services patch.
  • 3.10 is used in kicad and kicad-unstable to work around a breaking change in CMake 3.11

I'm testing removing both of these usages and using 3.12 only.

@thefloweringash thefloweringash changed the base branch from master to staging August 13, 2018 02:06
@thefloweringash
Copy link
Member Author

thefloweringash commented Aug 13, 2018 •
edited

Darwin stdenv seems to be ok, still waiting to see if this breaks kicad.

@thefloweringash
Copy link
Member Author

thefloweringash commented Aug 13, 2018 •
edited

KiCad fixed their CMake 3.11 incompatibility long before the 5.0.0 release, and both kicad and kicad-unstable build locally for me. This PR should be ready to go.

(KiCad fix in git mirror of upstream: KiCad/kicad-source-mirror@2e0b75c)

@Ericson2314 Ericson2314 removed their request for review August 13, 2018 17:41
@Mic92 Mic92 removed request for FRidh and ttuegel August 16, 2018 08:25
@matthewbauer
Copy link
Member

Is cmake not using the provided libuv? It shouldn’t be building the vendored one.

@thefloweringash
Copy link
Member Author

It's only using the vendored one when building with useSharedLibraries = false, which is the case for the bootstrap version in the darwin stdenv.

@xeji
Copy link
Contributor

xeji commented Aug 27, 2018

@GrahamcOfBorg build cmake

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: cmake

Partial log (click to expand)

shrinking /nix/store/93w3v8ql9gjaz9k7f0nfffmcnj6ixz9w-cmake-3.12.1/bin/cpack
shrinking /nix/store/93w3v8ql9gjaz9k7f0nfffmcnj6ixz9w-cmake-3.12.1/bin/ctest
shrinking /nix/store/93w3v8ql9gjaz9k7f0nfffmcnj6ixz9w-cmake-3.12.1/bin/cmake
strip is /nix/store/y4ymnvgxygpq05h03kyzbj572zmh6zla-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/93w3v8ql9gjaz9k7f0nfffmcnj6ixz9w-cmake-3.12.1/bin
patching script interpreter paths in /nix/store/93w3v8ql9gjaz9k7f0nfffmcnj6ixz9w-cmake-3.12.1
/nix/store/93w3v8ql9gjaz9k7f0nfffmcnj6ixz9w-cmake-3.12.1/share/cmake-3.12/Modules/CPack.STGZ_Header.sh.in: interpreter directive changed from "/bin/sh" to "/nix/store/fqm2x6kiay1q4vg7pqp4wp17bdijlyc3-bash-4.4-p23/bin/sh"
/nix/store/93w3v8ql9gjaz9k7f0nfffmcnj6ixz9w-cmake-3.12.1/share/cmake-3.12/Modules/Squish4RunTestCase.sh: interpreter directive changed from "/bin/sh" to "/nix/store/fqm2x6kiay1q4vg7pqp4wp17bdijlyc3-bash-4.4-p23/bin/sh"
/nix/store/93w3v8ql9gjaz9k7f0nfffmcnj6ixz9w-cmake-3.12.1/share/cmake-3.12/Modules/SquishRunTestCase.sh: interpreter directive changed from "/bin/sh" to "/nix/store/fqm2x6kiay1q4vg7pqp4wp17bdijlyc3-bash-4.4-p23/bin/sh"
checking for references to /build in /nix/store/93w3v8ql9gjaz9k7f0nfffmcnj6ixz9w-cmake-3.12.1...

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: cmake

Partial log (click to expand)

shrinking /nix/store/6cv6kck5gvvzy6mw4nzvy3q3jy6bcwjc-cmake-3.12.1/bin/ctest
shrinking /nix/store/6cv6kck5gvvzy6mw4nzvy3q3jy6bcwjc-cmake-3.12.1/bin/cpack
shrinking /nix/store/6cv6kck5gvvzy6mw4nzvy3q3jy6bcwjc-cmake-3.12.1/bin/cmake
strip is /nix/store/h0lbngpv6ln56hjj59i6l77vxq25flbz-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/6cv6kck5gvvzy6mw4nzvy3q3jy6bcwjc-cmake-3.12.1/bin
patching script interpreter paths in /nix/store/6cv6kck5gvvzy6mw4nzvy3q3jy6bcwjc-cmake-3.12.1
/nix/store/6cv6kck5gvvzy6mw4nzvy3q3jy6bcwjc-cmake-3.12.1/share/cmake-3.12/Modules/SquishRunTestCase.sh: interpreter directive changed from "/bin/sh" to "/nix/store/czx8vkrb9jdgjyz8qfksh10vrnqa723l-bash-4.4-p23/bin/sh"
/nix/store/6cv6kck5gvvzy6mw4nzvy3q3jy6bcwjc-cmake-3.12.1/share/cmake-3.12/Modules/Squish4RunTestCase.sh: interpreter directive changed from "/bin/sh" to "/nix/store/czx8vkrb9jdgjyz8qfksh10vrnqa723l-bash-4.4-p23/bin/sh"
/nix/store/6cv6kck5gvvzy6mw4nzvy3q3jy6bcwjc-cmake-3.12.1/share/cmake-3.12/Modules/CPack.STGZ_Header.sh.in: interpreter directive changed from "/bin/sh" to "/nix/store/czx8vkrb9jdgjyz8qfksh10vrnqa723l-bash-4.4-p23/bin/sh"
checking for references to /build in /nix/store/6cv6kck5gvvzy6mw4nzvy3q3jy6bcwjc-cmake-3.12.1...

@GrahamcOfBorg
Copy link

Timed out, unknown build status on x86_64-darwin (full log)

Attempted: cmake

Partial log (click to expand)

cannot build derivation '/nix/store/s0qrkvi0wgvgbf1ia618rjan7cq1n5sq-ps-1003.1-2008.drv': 2 dependencies couldn't be built
cannot build derivation '/nix/store/1y4rlvpf7bfmhbrkhpq0ajbccqvld4kz-xnu-osx-10.11.6.drv': 8 dependencies couldn't be built
cannot build derivation '/nix/store/l8za43cgn4wci8qm2csd0p0rh5wak5ap-IOKit-osx-10.11.6.drv': 2 dependencies couldn't be built
cannot build derivation '/nix/store/q8mvdikpsi2kh72368lc1q9sc4b48vfp-curl-7.61.0.drv': 7 dependencies couldn't be built
cannot build derivation '/nix/store/81vzs4w9r3xwf04v80lnq5lhw13lcsqh-configd-osx-10.8.5.drv': 8 dependencies couldn't be built
cannot build derivation '/nix/store/s98m4rvmhc88frr80ddmffjwafrbzldm-python-2.7.15.drv': 9 dependencies couldn't be built
cannot build derivation '/nix/store/gaq3m9f4y7fxv016x74fi49b3anjy9a5-libxml2-2.9.8.drv': 3 dependencies couldn't be built
cannot build derivation '/nix/store/1lgq5aj3hnylsycxzjil21qspsb74ici-libarchive-3.3.2.drv': 6 dependencies couldn't be built
cannot build derivation '/nix/store/zk7hj0kpqxynwgfdq6m0gn3fig8lp0g1-cmake-3.12.1.drv': 9 dependencies couldn't be built
error: build of '/nix/store/zk7hj0kpqxynwgfdq6m0gn3fig8lp0g1-cmake-3.12.1.drv' failed

vcunat
vcunat approved these changes Aug 30, 2018
View reviewed changes
Copy link
Member

@vcunat vcunat left a comment

Choose a reason for hiding this comment

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

This seems nice. Darwin was thoroughly tested as well, apparently.

@vcunat vcunat merged commit e841ffe into NixOS:staging Aug 30, 2018
vcunat added a commit that referenced this pull request Aug 30, 2018
@vcunat
Merge #44910: cmake: 3.11.2 -> 3.12.1
b71b222
xeji added a commit that referenced this pull request Aug 30, 2018
@xeji
cmake_2_8: fix build, restore search-path.patch
8aa09a2 
cmake 3.12 update in #44910 modified search-path.patch
and broke cmake 2.8. This restores the previous version
of the patch as search-path-2.8.patch
This was referenced Aug 31, 2018
Merged
Merged
Merged
Merged
@thefloweringash thefloweringash deleted the cmake-3.12.1 branch September 24, 2018 11:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vcunat vcunat vcunat approved these changes

Assignees
No one assigned
Labels
6.topic: stdenv Standard environment 10.rebuild-darwin: 501+ 10.rebuild-darwin-stdenv 10.rebuild-linux: 501+
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@thefloweringash @xeji @matthewbauer @GrahamcOfBorg @vcunat