From c121f6746b8e0e7a1b4d719b6c13ec98eacceb53 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 15 Nov 2007 15:19:58 +0000
Subject: [PATCH] * Default compiler changed to GCC 4.2.2. * Fix for NIXPKGS-60
 ("g++ 4.2.0 cannot create dynamically linked executables").

svn path=/nixpkgs/branches/stdenv-updates/; revision=9691
---
 .../development/compilers/gcc-4.2/default.nix | 14 ++++++-------
 .../compilers/gcc-4.2/no-sys-dirs.patch       | 20 -------------------
 pkgs/top-level/all-packages.nix               |  8 ++++----
 3 files changed, 11 insertions(+), 31 deletions(-)

diff --git a/pkgs/development/compilers/gcc-4.2/default.nix b/pkgs/development/compilers/gcc-4.2/default.nix
index 2681531f204..df0f3e5c48d 100644
--- a/pkgs/development/compilers/gcc-4.2/default.nix
+++ b/pkgs/development/compilers/gcc-4.2/default.nix
@@ -9,21 +9,21 @@ assert langC;
 with import ../../../lib;
 
 stdenv.mkDerivation {
-  name = "gcc-4.2.0";
+  name = "gcc-4.2.2";
   builder = ./builder.sh;
   
   src =
     optional /*langC*/ true (fetchurl {
-      url = mirror://gnu/gcc/gcc-4.2.0/gcc-core-4.2.0.tar.bz2;
-      sha256 = "0ykhzxhr8857dr97z0j9wyybfz1kjr71xk457cfapfw5fjas4ny1";
+      url = mirror://gnu/gcc/gcc-4.2.2/gcc-core-4.2.2.tar.bz2;
+      sha256 = "01hdwd4im2xzg159fk022zqyhlxphqvpmabd25bqb8fjbs2yi80a";
     }) ++
     optional /*langCC*/ true (fetchurl {
-      url = mirror://gnu/gcc/gcc-4.2.0/gcc-g++-4.2.0.tar.bz2;
-      sha256 = "0k5ribrfdp9vmljxrglcgx2j2r7xnycd1rvd8sny2y5cj0l8ps12";
+      url = mirror://gnu/gcc/gcc-4.2.2/gcc-g++-4.2.2.tar.bz2;
+      sha256 = "04xankxi3bi4gvgv8rq9h6w3bdx59bg9zh0zv6lyw373gy26ygmq";
     }) ++
     optional langF77 (fetchurl {
-      url = mirror://gnu/gcc/gcc-4.2.0/gcc-fortran-4.2.0.tar.bz2;
-      sha256 = "0vw07qv6qpa5cgxc0qxraq6li2ibh8zrp65jrg92v4j63ivvi3hh";
+      url = mirror://gnu/gcc/gcc-4.2.2/gcc-fortran-4.2.2.tar.bz2;
+      sha256 = "1fybl88w0l99cqppx18i6hnq5dsrssx3qd7vr2ybmmk3nfx8pziq";
     });
     
   patches =
diff --git a/pkgs/development/compilers/gcc-4.2/no-sys-dirs.patch b/pkgs/development/compilers/gcc-4.2/no-sys-dirs.patch
index d87f54669b7..f1d429e274a 100644
--- a/pkgs/development/compilers/gcc-4.2/no-sys-dirs.patch
+++ b/pkgs/development/compilers/gcc-4.2/no-sys-dirs.patch
@@ -120,26 +120,6 @@ diff -rc gcc-4.2.0-orig/gcc/gcc.c gcc-4.2.0/gcc/gcc.c
   static const char *md_exec_prefix = MD_EXEC_PREFIX;
   
   static const char *md_startfile_prefix = MD_STARTFILE_PREFIX;
-diff -rc gcc-4.2.0-orig/ltcf-cxx.sh gcc-4.2.0/ltcf-cxx.sh
-*** gcc-4.2.0-orig/ltcf-cxx.sh	2005-07-16 04:30:53.000000000 +0200
---- gcc-4.2.0/ltcf-cxx.sh	2007-05-20 17:16:44.000000000 +0200
-***************
-*** 989,995 ****
-    # the conftest object file.
-    pre_test_object_deps_done=no
-  
-!   for p in `eval $output_verbose_link_cmd`; do
-  
-      case $p in
-  
---- 989,995 ----
-    # the conftest object file.
-    pre_test_object_deps_done=no
-  
-!   for p in `true`; do
-  
-      case $p in
-  
 diff -rc gcc-4.2.0-orig/ltconfig gcc-4.2.0/ltconfig
 *** gcc-4.2.0-orig/ltconfig	2007-02-14 18:08:35.000000000 +0100
 --- gcc-4.2.0/ltconfig	2007-05-20 22:16:24.000000000 +0200
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 90e2d4bc7a5..1b31a9e69a0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -889,7 +889,7 @@ rec {
     inherit stdenv;
   };
  
-  gcc = gcc41;
+  gcc = gcc42;
 
   gcc295 = wrapGCC (import ../development/compilers/gcc-2.95 {
     inherit fetchurl stdenv noSysDirs;
@@ -908,14 +908,14 @@ rec {
     profiledCompiler = true;
   });
 
-  gcc41 = useFromStdenv (stdenv ? gcc) stdenv.gcc (wrapGCC (import ../development/compilers/gcc-4.1 {
+  gcc41 = wrapGCC (import ../development/compilers/gcc-4.1 {
     inherit fetchurl stdenv noSysDirs;
     profiledCompiler = false;
-  }));
+  });
 
   gcc41NPTL = wrapGCCWithGlibc gcc41.gcc glibcNPTL;
 
-  gcc42 = lowPrio (wrapGCC (import ../development/compilers/gcc-4.2 {
+  gcc42 = useFromStdenv (stdenv ? gcc) stdenv.gcc (wrapGCC (import ../development/compilers/gcc-4.2 {
     inherit fetchurl stdenv noSysDirs;
     profiledCompiler = true;
   }));