From 4547dffb5dc30cb090669342d24586c77f678fb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Thu, 6 May 2010 19:19:02 +0000
Subject: [PATCH] Fixing gcc-4.5 related to the patch for ultrasparc. The patch
 should not be needed anymore

svn path=/nixpkgs/trunk/; revision=21633
---
 .../development/compilers/gcc-4.5/default.nix |  5 ++--
 .../compilers/gcc-4.5/pr41818.patch           | 26 -------------------
 2 files changed, 3 insertions(+), 28 deletions(-)
 delete mode 100644 pkgs/development/compilers/gcc-4.5/pr41818.patch

diff --git a/pkgs/development/compilers/gcc-4.5/default.nix b/pkgs/development/compilers/gcc-4.5/default.nix
index 8d088be0f8f..9ef82293242 100644
--- a/pkgs/development/compilers/gcc-4.5/default.nix
+++ b/pkgs/development/compilers/gcc-4.5/default.nix
@@ -132,13 +132,14 @@ stdenv.mkDerivation ({
   };
 
   patches =
-    [ ./libstdc++-target.patch ]
+    [ ]
+    ++ optional (cross != null) ./libstdc++-target.patch
     ++ optional noSysDirs ./no-sys-dirs.patch
     # The GNAT Makefiles did not pay attention to CFLAGS_FOR_TARGET for its
     # target libraries and tools.
     ++ optional langAda ./gnat-cflags.patch
     ++ optional langVhdl ./ghdl-ortho-cflags.patch
-    ++ optional (cross != null && cross.arch == "sparc64") ./pr41818.patch;
+    ;
 
   inherit noSysDirs profiledCompiler staticCompiler langJava crossStageStatic
     libcCross crossMingw;
diff --git a/pkgs/development/compilers/gcc-4.5/pr41818.patch b/pkgs/development/compilers/gcc-4.5/pr41818.patch
deleted file mode 100644
index 98731c46067..00000000000
--- a/pkgs/development/compilers/gcc-4.5/pr41818.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=41818>.  This fixes compilation
-of the sparc64-linux-gnu cross-compiler with shared libraries.
-
---- trunk/Makefile.in	2010/01/07 19:21:46	155705
-+++ trunk/Makefile.in	2010/01/07 19:53:50	155706
-@@ -259,7 +259,7 @@
- # directories built for the target.
- TARGET_CONFIGARGS = @target_configargs@ --with-target-subdir="$(TARGET_SUBDIR)"
- # This is the list of variables to export in the environment when
--# configuring subdirectories for the host system.
-+# configuring subdirectories for the target system.
- BASE_TARGET_EXPORTS = \
- 	$(BASE_EXPORTS) \
- 	AR="$(AR_FOR_TARGET)"; export AR; \
-@@ -281,7 +281,10 @@
- 	STRIP="$(STRIP_FOR_TARGET)"; export STRIP; \
- 	WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
- 	WINDMC="$(WINDMC_FOR_TARGET)"; export WINDMC; \
--	$(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
-+@if gcc-bootstrap
-+	$(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \
-+@endif gcc-bootstrap
-+	$(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
- 
- RAW_CXX_TARGET_EXPORTS = \
- 	$(BASE_TARGET_EXPORTS) \