Merge remote-tracking branch 'origin/master' into stdenv-updates.

pkgs/development/compilers/gcc/3.3/builder.sh

@@ -35,7 +35,7 @@ EOF
     cd ../build
 
     configureScript=../$sourceRoot/configure
-    configureFlags="--enable-languages=$langs"
+    configureFlags="--enable-languages=$langs --disable-multilib"
 }
 
 

pkgs/development/compilers/gcc/3.3/default.nix

@@ -15,7 +15,12 @@ stdenv.mkDerivation {
     url = http://ftp.gnu.org/gnu/gcc/gcc-3.3.6/gcc-3.3.6.tar.bz2;
     md5 = "6936616a967da5a0b46f1e7424a06414";
   };
-  
+
+  # inspiration: https://aur.archlinux.org/packages/g77/
+  postPatch = ''
+    substituteInPlace gcc/config/i386/linux.h --replace 'struct siginfo' siginfo_t
+  '';
+
   inherit noSysDirs langC langCC langFortran;
 
   meta = {

pkgs/development/compilers/gcc/3.4/default.nix

@@ -15,7 +15,12 @@ stdenv.mkDerivation {
     md5 = "4a21ac777d4b5617283ce488b808da7b";
   };
 
-  patches = if noSysDirs then [./no-sys-dirs.patch] else [];
+  patches = stdenv.lib.optional noSysDirs ./no-sys-dirs.patch;
+
+  # inspiration: https://aur.archlinux.org/packages/g77/
+  postPatch = ''
+    substituteInPlace gcc/config/i386/linux.h --replace 'struct siginfo' siginfo_t
+  '';
 
   inherit noSysDirs profiledCompiler;