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

libtins: Force compilation using C++14. #290931

Merged
merged 1 commit into from
Mar 15, 2024

Conversation

simonhollingshead
Copy link
Contributor

@simonhollingshead simonhollingshead commented Feb 23, 2024

Description of changes

#282245 breaks C++11 users. Libtins is not only a C++11 user, but it also has chunks of code dedicated to working out which C++11 features are enabled to choose whether to include the C++ optimisations or not.

In this change, I've decided to just force C++14 mode and to remove the check on whether the features are enabled or not. Otherwise I would have to port the enablement checks and probably perform a lot of renaming throughout the codebase for accuracy.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@simonhollingshead simonhollingshead marked this pull request as ready for review February 23, 2024 17:19
@ofborg ofborg bot requested a review from fdns February 23, 2024 17:35
@vcunat vcunat changed the base branch from staging-next to master February 24, 2024 20:39
Copy link
Contributor

@OmnipotentEntity OmnipotentEntity left a comment

Choose a reason for hiding this comment

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

I can confirm this patch works, and that binaries that are currently broken because they depend on libtins (such as Mathematica) function with this patch.

@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Mar 8, 2024
@doronbehar doronbehar merged commit 6bea063 into NixOS:master Mar 15, 2024
40 checks passed
@doronbehar
Copy link
Contributor

Thanks!

@doronbehar
Copy link
Contributor

See upstream report at: mfontanini/libtins#529 @OmnipotentEntity next time, remember to file an issue upstream, and ideally link to it in a comment near the patch.

@OmnipotentEntity
Copy link
Contributor

Not my patch or PR, you want to be talking to @simonhollingshead

Though I'll keep this in mind in the future when reviewing PRs

@simonhollingshead simonhollingshead deleted the libtins-cpp14 branch October 22, 2024 04:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 12.approvals: 1 This PR was reviewed and approved by one reputable person
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants