gcc: patches: reorganize and simplify#250496
Merged
Conversation
1 task
This PR sorts the huge pile of patches and deduplicates it. Unlike its predecessors #249707 and #250489 this commit *does* affect eval. Patches below are organized into three general categories: 1. Patches relevant to gcc>=12 on every platform 2. Patches relevant to gcc>=12 on specific platforms 3. Patches relevant only to gcc<12, sorted by the newest version to which they might be relevant
Member
|
when i apply diff --git a/pkgs/development/compilers/gcc/patches/default.nix b/pkgs/development/compilers/gcc/patches/default.nix
index f65842196ab1..1d010600c0d4 100644
--- a/pkgs/development/compilers/gcc/patches/default.nix
+++ b/pkgs/development/compilers/gcc/patches/default.nix
@@ -70,8 +70,8 @@ in
"9" = [ ./no-sys-dirs-riscv-gcc9.patch ];
}."${majorVersion}" or [])
)
-++ optional (atLeast12 && langAda) ./gnat-cflags-11.patch
-++ optional langFortran (if atLeast12 then ./gcc-12-gfortran-driving.patch else ./gfortran-driving.patch)
+++ optional (atLeast12 && true) ./gnat-cflags-11.patch
+++ optional true (if atLeast12 then ./gcc-12-gfortran-driving.patch else ./gfortran-driving.patch)
++ optional atLeast7 ./ppc-musl.patch
++ optional is12 ./12/lambda-ICE-PR109241.patch # backport ICE fix on ccache code
++ optional (atLeast9 && langD) ./libphobos.patchthere are no hash changes on x86_64-linux or i pushed a commit so we can check all 4 systems |
Member
|
checked locally and it's stuff like this |
Member
|
applied to get a cleaner diff
A ordering issue? |
Member
|
Once I move |
Member
|
Conflict comes from (fetchpatch {
name = "avoid-ustat-glibc-2.28.patch";
url = "https://gitweb.gentoo.org/proj/gcc-patches.git/plain/4.9.4/gentoo/100_all_avoid-ustat-glibc-2.28.patch?id=55fcb515620a8f7d3bb77eba938aa0fcf0d67c96";
sha256 = "0b32sb4psv5lq0ij9fwhi1b4pjbwdjnv24nqprsk14dsc6xmi1g0";
}) |
otherwise there is a conflict
Member
|
Works on x86_64-linux |
Member
the removal of darwin-r0.diff patch from gcc11 maybe was intentional. Can't test darwin builds because the community builder says "error: writing to file: No space left on device" Can someone with darwin run |
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
This PR sorts the huge pile of patches and deduplicates it. Unlike its predecessors #249707 and #250489 this commit does affect eval.
Patches below are organized into three general categories:
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/)