Skip to content

Comments

binutils: add upstream patch to fix issue with parallel use of dlltool#172617

Merged
lovesegfault merged 1 commit intoNixOS:stagingfrom
SFrijters:patch-binutils-deterministic-temp-prefixes
May 14, 2022
Merged

binutils: add upstream patch to fix issue with parallel use of dlltool#172617
lovesegfault merged 1 commit intoNixOS:stagingfrom
SFrijters:patch-binutils-deterministic-temp-prefixes

Conversation

@SFrijters
Copy link
Member

@SFrijters SFrijters commented May 11, 2022 •
edited
Loading

Description of changes

binutils-2.38 contains a bug that can cause parallel invocations of dlltool to fail: https://sourceware.org/bugzilla/show_bug.cgi?id=28885

This causes issues like #170946 in nixpkgs.

A patch is available upstream and will be included in 2.39, but in the mean time I would be nice to be able to build wine in parallel again.

This probably causes a huge rebuild, so it should target... staging?

Things done

Currently trying to build wine to test if this actually fixes that particular issue.

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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/)
  • 22.05 Release Notes (or backporting 21.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
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@SFrijters SFrijters mentioned this pull request May 11, 2022
Merged
13 tasks
@ofborg ofborg bot added 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 10.rebuild-linux-stdenv This PR causes stdenv to rebuild on Linux and must target a staging branch. 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels May 12, 2022
@lovesegfault
Copy link
Member

lovesegfault commented May 12, 2022

Yup, please target staging.

Thanks for investigating and fixing this, it's greatly appreciated :)

@SFrijters SFrijters force-pushed the patch-binutils-deterministic-temp-prefixes branch from e9244b7 to 4b0f59a Compare May 12, 2022 10:46
@github-actions github-actions bot added 6.topic: golang Go is a high-level general purpose programming language that is statically typed and compiled. 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: python Python is a high-level, general-purpose programming language. 6.topic: systemd Software suite that provides an array of system components for Linux operating systems. 8.has: module (update) This PR changes an existing module in `nixos/` labels May 12, 2022
@SFrijters SFrijters changed the base branch from master to staging May 12, 2022 10:48
@github-actions github-actions bot removed 6.topic: systemd Software suite that provides an array of system components for Linux operating systems. 6.topic: python Python is a high-level, general-purpose programming language. 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: golang Go is a high-level general purpose programming language that is statically typed and compiled. 8.has: module (update) This PR changes an existing module in `nixos/` labels May 12, 2022
@SFrijters
Copy link
Member Author

SFrijters commented May 12, 2022 •
edited
Loading

Can confirm it fixes the wine issue I was seeing; retargeted to staging.
EDIT: Apologies for the reviewer spam; I rebased the commit locally first without changing the target on GitHub :(

@SFrijters SFrijters changed the title binutils: add patch to fix issue with parallel use of dlltool binutils: add upstream patch to fix issue with parallel use of dlltool May 12, 2022
@ofborg ofborg bot added 8.has: clean-up This PR removes packages or removes other cruft 8.has: package (new) This PR adds a new package labels May 12, 2022
@SFrijters
Copy link
Member Author

SFrijters commented May 13, 2022

It seems Hydra is running into a timeout; I don't think this is directly related to this patch?

@vcunat
Copy link
Member

vcunat commented May 13, 2022

Yes, this is too big for the CI. (and it's no hydra, by the way)

@lovesegfault lovesegfault merged commit 9e19de1 into NixOS:staging May 14, 2022
@SFrijters SFrijters deleted the patch-binutils-deterministic-temp-prefixes branch May 15, 2022 20:31
This was referenced May 18, 2022
Closed
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@7c6f434c 7c6f434c 7c6f434c approved these changes

@Ericson2314 Ericson2314 Awaiting requested review from Ericson2314

@lovesegfault lovesegfault Awaiting requested review from lovesegfault

@kalbasit kalbasit Awaiting requested review from kalbasit

@Mic92 Mic92 Awaiting requested review from Mic92

@zowoq zowoq Awaiting requested review from zowoq

@adisbladis adisbladis Awaiting requested review from adisbladis

@FRidh FRidh Awaiting requested review from FRidh

@jonringer jonringer Awaiting requested review from jonringer

Assignees

No one assigned

Labels

8.has: clean-up This PR removes packages or removes other cruft 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. 10.rebuild-linux-stdenv This PR causes stdenv to rebuild on Linux and must target a staging branch.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@SFrijters @lovesegfault @vcunat @7c6f434c