nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-10-02 21:10:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "gcc: install info files serially"

Browse Source 
Because the build still uses a pre-4.4 version of GNU Make,
this option makes the whole build serial rather than only
the installation.

See also https://gcc.gnu.org/PR109898

This reverts commit f3995cee01.
This commit is contained in:
Arnout Engelen
2023-06-13 15:33:38 +02:00
parent d7d5b41882
commit e8d0aa9d19
10 changed files with 0 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/development/compilers/gcc/10/default.nix
View File

@@ -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

1
pkgs/development/compilers/gcc/11/default.nix
View File

@@ -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

1
pkgs/development/compilers/gcc/12/default.nix
View File

@@ -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

1
pkgs/development/compilers/gcc/4.8/default.nix
View File

@@ -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";

1
pkgs/development/compilers/gcc/4.9/default.nix
View File

@@ -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";

1
pkgs/development/compilers/gcc/6/default.nix
View File

@@ -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

1
pkgs/development/compilers/gcc/7/default.nix
View File

@@ -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 [

1
pkgs/development/compilers/gcc/8/default.nix
View File

@@ -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

1
pkgs/development/compilers/gcc/9/default.nix
View File

@@ -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

15
pkgs/development/compilers/gcc/install-info-files-serially.patch
View File

@@ -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.