Skip to content

gcc13: drop already upstreamed mingwW64 patch#234887

Merged
trofi merged 1 commit intoNixOS:masterfrom
trofi:mingw-w64-gcc-13-fix
Jun 6, 2023
Merged

gcc13: drop already upstreamed mingwW64 patch#234887
trofi merged 1 commit intoNixOS:masterfrom
trofi:mingw-w64-gcc-13-fix

Conversation

@trofi
Copy link
Contributor

@trofi trofi commented May 29, 2023

Without the change the patch failed to apply as:

$ nix build -f. pkgsCross.mingwW64.stdenv.cc.cc
...
x86_64-w64-mingw32-stage-final-gcc> applying patch /nix/store/sb9irfs83qvdgkf23agvv1vn96n9z31p-Added-mcf-thread-model-support-from-mcfgthread.patch
x86_64-w64-mingw32-stage-final-gcc> patching file config/gthr.m4
x86_64-w64-mingw32-stage-final-gcc> Reversed (or previously applied) patch detected!  Assume -R? [n]
x86_64-w64-mingw32-stage-final-gcc> Apply anyway? [n]
x86_64-w64-mingw32-stage-final-gcc> Skipping patch.
...

The patch is apready present in gcc-13.1.0.

Description of changes
Things done
  • 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/)
  • 23.05 Release Notes (or backporting 22.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.

Without the change the patch failed to apply as:

```
$ nix build -f. pkgsCross.mingwW64.stdenv.cc.cc
...
x86_64-w64-mingw32-stage-final-gcc> applying patch /nix/store/sb9irfs83qvdgkf23agvv1vn96n9z31p-Added-mcf-thread-model-support-from-mcfgthread.patch
x86_64-w64-mingw32-stage-final-gcc> patching file config/gthr.m4
x86_64-w64-mingw32-stage-final-gcc> Reversed (or previously applied) patch detected!  Assume -R? [n]
x86_64-w64-mingw32-stage-final-gcc> Apply anyway? [n]
x86_64-w64-mingw32-stage-final-gcc> Skipping patch.
...
```

The patch is apready present in gcc-13.1.0.
@trofi trofi requested a review from matthewbauer as a code owner May 29, 2023 21:40
@trofi trofi marked this pull request as draft May 29, 2023 21:42
@trofi
Copy link
Contributor Author

trofi commented May 29, 2023

Might require more fixes to provide the libc:

./gthr-default.h:34:10: fatal error: mcfgthread/gthr.h: No such file or directory
   34 | #include <mcfgthread/gthr.h>
      |          ^~~~~~~~~~~~~~~~~~~

@trofi trofi mentioned this pull request May 29, 2023
12 tasks
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels May 29, 2023
@trofi trofi marked this pull request as ready for review June 6, 2023 07:04
@trofi
Copy link
Contributor Author

trofi commented Jun 6, 2023

It needs an mcfgtreads update (has to happen in a lockstep with default gcc. I'll merge this patch as is as it does not make things worse.

@trofi trofi merged commit aaf4f4a into NixOS:master Jun 6, 2023
@trofi trofi deleted the mingw-w64-gcc-13-fix branch June 6, 2023 07:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant