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

czmq: Fix build with gcc-7 #31765

Merged
merged 1 commit into from Nov 17, 2017
Merged

czmq: Fix build with gcc-7 #31765

merged 1 commit into from Nov 17, 2017

Conversation

adisbladis
Copy link
Member

Motivation for this change

See tracking issue #31747

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.

url = https://patch-diff.githubusercontent.com/raw/zeromq/czmq/pull/1618.patch;
sha256 = "1dssy7k0fni6djail8rz0lk8p777158jvrqhgn500i636gkxaxhp";
})
];
Copy link
Contributor

Choose a reason for hiding this comment

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

Doesn't it apply to czmq 3?

Copy link
Member Author

Choose a reason for hiding this comment

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

No. Had to be backported.
The patch attached to czmq3 is the same as czmq4, just backported to apply.

@vcunat
Copy link
Member

vcunat commented Nov 17, 2017

I wonder whether to merge gcc7-specific fixes to master or just to gcc-7 branch directly.

@orivej
Copy link
Contributor

orivej commented Nov 17, 2017

Unless we may decide not to upgrade to GCC 7, I'd prefer to commit to master and staging; or commit to gcc-7 and periodically merge gcc-7 (except the gcc upgrade) to staging. This simplifies maintenance and ensures that the patches receive some user testing before the final switch to gcc 7.

@vcunat
Copy link
Member

vcunat commented Nov 17, 2017

OK, to master and staging. We would better not merge gcc-7 to staging yet, as staging is meant for things ready to be merged to master. And this week I even see lots of failures on staging...

@orivej orivej changed the base branch from master to staging November 17, 2017 20:47
@orivej orivej merged commit 1352789 into NixOS:staging Nov 17, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants