gcc/11: apply upstream fix 103910 so openjdk builds#212363
Merged
vcunat merged 1 commit intostaging-nextfrom Feb 13, 2023
unknown repository
Merged
gcc/11: apply upstream fix 103910 so openjdk builds#212363vcunat merged 1 commit intostaging-nextfrom unknown repository
vcunat merged 1 commit intostaging-nextfrom
unknown repository
Conversation
ghost
mentioned this pull request
13 tasks
ofborg
bot
added
the
10.rebuild-linux-stdenv
ofborg
bot
added
10.rebuild-darwin: 501+
ghost
marked this pull request as ready for review
vcunat
requested changes
Feb 1, 2023
Member
vcunat
left a comment
vcunat
left a comment
There was a problem hiding this comment.
fetchurl won't have a stable hash in this case. This web generates the patch dynamically - there's even git version in the output. I'd most likely just add the file into nixpkgs git just as others. (fetchpatch is problematic during stdenv bootstrapping)
Member
|
(On current |
ofborg
bot
removed
the
10.rebuild-linux-stdenv
ofborg
bot
added
10.rebuild-darwin: 11-100
Author
Sorry about the slow reply. I'm back now and dealing with the backlog. |
Member
|
Well, maybe this won't be important anymore, as gcc12 is becoming the default and shouldn't need this fix... |
Our openjdk derivations fail to build with `-march=opteron` (via either `NIX_CFLAGS_COMPILE` or `hostPlatform.gcc.arch`). This was fixed upstream in gcc12 but not carried back to gcc11: https://gcc.gnu.org/git/gitweb.cgi?p=gcc.git;h=d243f4009d8071b734df16cd70f4c5d09a373769 https://gcc.gnu.org/bugzilla/show_bug.cgi?id=103910 Since gcc11 is still nixpkgs' primary compiler, this PR cherry-picks the fix out of gcc12. Unfortunately since `-march=` can be added after the `gcc11` derivation is built we can't apply this patch conditionally (which we don't usually do anyways).
ghost
marked this pull request as draft
ghost
marked this pull request as ready for review
Member
|
OK, why not. |
Member
|
Backport to staging-22.11, I guess? There gcc11 remains the default for |
1 task
Contributor
|
Successfully created backport PR for |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description of changes
Our openjdk derivations fail to build with
-march=opteron(via eitherNIX_CFLAGS_COMPILEorhostPlatform.gcc.arch). This was fixed upstream in gcc12 but not carried back to gcc11:https://gcc.gnu.org/git/gitweb.cgi?p=gcc.git;h=d243f4009d8071b734df16cd70f4c5d09a373769
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=103910
Since gcc11 is still nixpkgs' primary compiler, this PR cherry-picks the fix out of gcc12.
Unfortunately since
-march=can be added after thegcc11derivation is built we can't apply this patch conditionally (which we don't usually do anyways).Things done
sandbox = trueset innix.conf? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)nixos/doc/manual/md-to-db.shto update generated release notes