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

cmake: 3.19.0 -> 3.19.1 #105355

Merged
merged 1 commit into from Nov 29, 2020
Merged

cmake: 3.19.0 -> 3.19.1 #105355

merged 1 commit into from Nov 29, 2020

Conversation

@lukegb
Copy link
Contributor

@lukegb lukegb commented Nov 29, 2020

Motivation for this change

This fixes issues with building LibreSSL, which is required for the
NixOS tests: https://cmake.org/cmake/help/latest/release/3.19.html#id1

CMake 3.19.0 compiles source files with the LANGUAGE property by
passing an explicit language flag such as -x c. This is consistent
with the property’s documented meaning that the source file is written
in the specified language. However, it can break projects that were
using the property only to cause the specified language’s compiler to
be used. This has been reverted to restore behavior from CMake 3.18
and below.

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.
This fixes issues with building LibreSSL, which is required for the
NixOS tests: https://cmake.org/cmake/help/latest/release/3.19.html#id1

> CMake 3.19.0 compiles source files with the `LANGUAGE` property by
> passing an explicit language flag such as -x c. This is consistent
> with the property’s documented meaning that the source file is written
> in the specified language. However, it can break projects that were
> using the property only to cause the specified language’s compiler to
> be used. This has been reverted to restore behavior from CMake 3.18
> and below.
@FRidh
Copy link
Member

@FRidh FRidh commented Nov 29, 2020

Testing locally.

@FRidh FRidh added this to WIP in Staging via automation Nov 29, 2020
@FRidh FRidh self-assigned this Nov 29, 2020
@lukegb
Copy link
Contributor Author

@lukegb lukegb commented Nov 29, 2020

This appears to fix at least nixos/tests/enlightenment.nix for me.

@FRidh
Copy link
Member

@FRidh FRidh commented Nov 29, 2020

libressl now builds

@FRidh FRidh merged commit 31dfbca into NixOS:staging Nov 29, 2020
4 of 7 checks passed
Staging automation moved this from WIP to Done Nov 29, 2020
@lukegb lukegb deleted the cmake3.19.1 branch Nov 29, 2020
@ofborg ofborg bot requested review from ttuegel and LnL7 Nov 29, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Staging
  
Done
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants