summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Kolmodin <kolmodin@gentoo.org>2007-03-10 13:47:00 +0000
committerLennart Kolmodin <kolmodin@gentoo.org>2007-03-10 13:47:00 +0000
commitdfec4875a220450773a66899ca34e89917cebf58 (patch)
tree7e5e011fedf764f724b4994f2b91c706542269fa /dev-lang
parentStable on ppc wrt bug 148938 (diff)
downloadgentoo-2-dfec4875a220450773a66899ca34e89917cebf58.tar.gz
gentoo-2-dfec4875a220450773a66899ca34e89917cebf58.tar.bz2
gentoo-2-dfec4875a220450773a66899ca34e89917cebf58.zip
Add missing patch to dev-lang/ghc-6.6
(Portage version: 2.1.2-r5)
Diffstat (limited to 'dev-lang')
-rw-r--r--dev-lang/ghc/ChangeLog5
-rw-r--r--dev-lang/ghc/files/ghc-6.5-norelax.patch13
2 files changed, 17 insertions, 1 deletions
diff --git a/dev-lang/ghc/ChangeLog b/dev-lang/ghc/ChangeLog
index 98f2aec78705..9150ff5b82eb 100644
--- a/dev-lang/ghc/ChangeLog
+++ b/dev-lang/ghc/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-lang/ghc
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.116 2007/03/07 18:03:59 kolmodin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.117 2007/03/10 13:47:00 kolmodin Exp $
+
+ 10 Mar 2007; <kolmodin@gentoo.org> +files/ghc-6.5-norelax.patch:
+ Add missing ghc-6.6 patch.
*ghc-6.6 (07 Mar 2007)
diff --git a/dev-lang/ghc/files/ghc-6.5-norelax.patch b/dev-lang/ghc/files/ghc-6.5-norelax.patch
new file mode 100644
index 000000000000..d4dc386c97c5
--- /dev/null
+++ b/dev-lang/ghc/files/ghc-6.5-norelax.patch
@@ -0,0 +1,13 @@
+diff -rN -u old-ghc-1/compiler/main/DriverPipeline.hs new-ghc/compiler/main/DriverPipeline.hs
+--- old-ghc-1/compiler/main/DriverPipeline.hs 2006-09-13 10:33:23.000000000 +0200
++++ new-ghc/compiler/main/DriverPipeline.hs 2006-09-13 10:33:23.000000000 +0200
+@@ -1014,6 +1014,8 @@
+ let ld_r args = SysTools.runLink dflags ([
+ SysTools.Option "-nostdlib",
+ SysTools.Option "-nodefaultlibs",
++ -- options '--relax' and '-r' are incompatible
++ SysTools.Option "-mno-relax",
+ SysTools.Option "-Wl,-r",
+ SysTools.Option ld_x_flag,
+ SysTools.Option "-o",
+