diff --git a/pkgs/development/compilers/gcc/10/default.nix b/pkgs/development/compilers/gcc/10/default.nix index df1cbdf18983..b8cb350311c8 100644 --- a/pkgs/development/compilers/gcc/10/default.nix +++ b/pkgs/development/compilers/gcc/10/default.nix @@ -55,7 +55,6 @@ let majorVersion = "10"; # Fix https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80431 ../fix-bug-80431.patch ../11/fix-struct-redefinition-on-glibc-2.36.patch - ../install-info-files-serially.patch ] ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch ++ optional noSysDirs ../no-sys-dirs.patch ++ optional (noSysDirs && hostPlatform.isRiscV) ../no-sys-dirs-riscv.patch diff --git a/pkgs/development/compilers/gcc/11/default.nix b/pkgs/development/compilers/gcc/11/default.nix index 8513f03d2da1..878766a1264c 100644 --- a/pkgs/development/compilers/gcc/11/default.nix +++ b/pkgs/development/compilers/gcc/11/default.nix @@ -59,7 +59,6 @@ let majorVersion = "11"; # Fix https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80431 ../fix-bug-80431.patch ./fix-struct-redefinition-on-glibc-2.36.patch - ../install-info-files-serially.patch ] ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch ++ optional noSysDirs ../no-sys-dirs.patch ++ optional (noSysDirs && hostPlatform.isRiscV) ../no-sys-dirs-riscv.patch diff --git a/pkgs/development/compilers/gcc/12/default.nix b/pkgs/development/compilers/gcc/12/default.nix index f0886f862c97..51d9f85bbbe3 100644 --- a/pkgs/development/compilers/gcc/12/default.nix +++ b/pkgs/development/compilers/gcc/12/default.nix @@ -68,7 +68,6 @@ let majorVersion = "12"; ../gnat-cflags-11.patch ../gcc-12-gfortran-driving.patch ../ppc-musl.patch - ../install-info-files-serially.patch # backport ICE fix on ccache code ./lambda-ICE-PR109241.patch diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index 90489fd3fb1c..99c8ef399b5d 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -74,7 +74,6 @@ let majorVersion = "4"; ../struct-ucontext-4.8.patch ../sigsegv-not-declared.patch ../res_state-not-declared.patch - ../install-info-files-serially.patch # gcc-11 compatibility (fetchpatch { name = "gcc4-char-reload.patch"; diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index ec0f4cde781d..90880752ca7a 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -63,7 +63,6 @@ let majorVersion = "4"; [ ../9/fix-struct-redefinition-on-glibc-2.36.patch ../use-source-date-epoch.patch ../parallel-bconfig.patch ./parallel-strsignal.patch ./libsanitizer.patch - ../install-info-files-serially.patch (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"; diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index 965a987aab35..df1523f78b2b 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -68,7 +68,6 @@ let majorVersion = "6"; # Fix https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80431 ../fix-bug-80431.patch - ../install-info-files-serially.patch ] ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch ++ optional noSysDirs ../no-sys-dirs.patch ++ optional langAda ../gnat-cflags.patch diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index 6ec689ab2524..0f7309fc1efc 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -61,7 +61,6 @@ let majorVersion = "7"; ../fix-bug-80431.patch ../9/fix-struct-redefinition-on-glibc-2.36.patch - ../install-info-files-serially.patch ] ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch ++ optionals targetPlatform.isNetBSD [ diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix index 1baed9137856..8d70948eda51 100644 --- a/pkgs/development/compilers/gcc/8/default.nix +++ b/pkgs/development/compilers/gcc/8/default.nix @@ -50,7 +50,6 @@ let majorVersion = "8"; # Fix https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80431 ../fix-bug-80431.patch ../9/fix-struct-redefinition-on-glibc-2.36.patch - ../install-info-files-serially.patch ] ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch ++ optional targetPlatform.isNetBSD ../libstdc++-netbsd-ctypes.patch ++ optional noSysDirs ../no-sys-dirs.patch diff --git a/pkgs/development/compilers/gcc/9/default.nix b/pkgs/development/compilers/gcc/9/default.nix index aceb912d7a69..f68a4c2d947a 100644 --- a/pkgs/development/compilers/gcc/9/default.nix +++ b/pkgs/development/compilers/gcc/9/default.nix @@ -59,7 +59,6 @@ let majorVersion = "9"; ./fix-struct-redefinition-on-glibc-2.36.patch # Fix https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80431 ../fix-bug-80431.patch - ../install-info-files-serially.patch ] ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch ++ optional targetPlatform.isNetBSD ../libstdc++-netbsd-ctypes.patch ++ optional noSysDirs ../no-sys-dirs.patch diff --git a/pkgs/development/compilers/gcc/install-info-files-serially.patch b/pkgs/development/compilers/gcc/install-info-files-serially.patch deleted file mode 100644 index bec7c0a158d0..000000000000 --- a/pkgs/development/compilers/gcc/install-info-files-serially.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -Naur gcc-12.2.0/gcc/Makefile.in gcc-12.2.0-new/gcc/Makefile.in ---- gcc-12.2.0/gcc/Makefile.in 2022-08-19 10:09:52.280658631 +0200 -+++ gcc-12.2.0-new/gcc/Makefile.in 2023-05-04 14:35:44.401420184 +0200 -@@ -3781,6 +3781,11 @@ - fi; \ - fi - -+# We don't care about the order in which the info files are built, but -+# install-info doesn't support multiple parallel invocations writing to -+# the same `dir-file`, so we have to disable parallelism for that reason: -+.NOTPARALLEL: install-info -+ - # Install the info files. - # $(INSTALL_DATA) might be a relative pathname, so we can't cd into srcdir - # to do the install.