diff options
| author |   Duncan Coutts <dcoutts@gentoo.org> | 2007-07-10 23:37:10 +0000 |
|---|---|---|
| committer | Duncan Coutts <dcoutts@gentoo.org> | 2007-07-10 23:37:10 +0000 |
| commit | 00be9adc50168fc2b8122b4c598032cf98c92b26 (patch) | |
| tree | 1aa9a09ece4caae2f26ba2c7f80c33e7bc735883 /dev-lang | |
| parent | whitespace (diff) | |
| download | historical-00be9adc50168fc2b8122b4c598032cf98c92b26.tar.gz historical-00be9adc50168fc2b8122b4c598032cf98c92b26.tar.bz2 historical-00be9adc50168fc2b8122b4c598032cf98c92b26.zip | |
Fix sparc "norelax" patch.
Package-Manager: portage-2.1.2.9
Diffstat (limited to 'dev-lang')
| -rw-r--r-- | dev-lang/ghc/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-lang/ghc/Manifest | 22 | ||||
| -rw-r--r-- | dev-lang/ghc/files/ghc-6.5-norelax.patch | 4 |
3 files changed, 18 insertions, 14 deletions
diff --git a/dev-lang/ghc/ChangeLog b/dev-lang/ghc/ChangeLog index 2331ce8a6a60..b3114d6e01fb 100644 --- a/dev-lang/ghc/ChangeLog +++ b/dev-lang/ghc/ChangeLog @@ -1,6 +1,10 @@ # 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.125 2007/07/10 17:16:49 dcoutts Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.126 2007/07/10 23:37:10 dcoutts Exp $ + + 10 Jul 2007; Duncan Coutts <dcoutts@gentoo.org> + files/ghc-6.5-norelax.patch: + Fix sparc "norelax" patch. 10 Jul 2007; Duncan Coutts <dcoutts@gentoo.org> -files/ghc-6.2.hardened.patch, -files/ghc-6.4.1-configure.patch, diff --git a/dev-lang/ghc/Manifest b/dev-lang/ghc/Manifest index da67a2a2f03f..dcb6679d4527 100644 --- a/dev-lang/ghc/Manifest +++ b/dev-lang/ghc/Manifest @@ -17,10 +17,10 @@ AUX ghc-6.4.2-sparcmangler.patch 837 RMD160 7e3a2a94bb62c3c0da09f08096481cace2b1 MD5 c42b26cfaf5469b236c345e1614370cc files/ghc-6.4.2-sparcmangler.patch 837 RMD160 7e3a2a94bb62c3c0da09f08096481cace2b1bb96 files/ghc-6.4.2-sparcmangler.patch 837 SHA256 3987724420c6d4b552c6fbb3b3ca10fca8aaa73573735aa3de824d3dc65f94af files/ghc-6.4.2-sparcmangler.patch 837 -AUX ghc-6.5-norelax.patch 615 RMD160 5f8d85a7caa10bc17bf53fe0f44ac07e819cf4f3 SHA1 c75eb55a0142af33a3dfc830e92224fbdbefb066 SHA256 db190b8f581059549c4a23a34db98cbfed0f3906cd017703993698376c569e01 -MD5 f2e6baefdb5bc76e27c654397a43cbd5 files/ghc-6.5-norelax.patch 615 -RMD160 5f8d85a7caa10bc17bf53fe0f44ac07e819cf4f3 files/ghc-6.5-norelax.patch 615 -SHA256 db190b8f581059549c4a23a34db98cbfed0f3906cd017703993698376c569e01 files/ghc-6.5-norelax.patch 615 +AUX ghc-6.5-norelax.patch 613 RMD160 71012d8615e164c72d0db75c8cc606ccf8e3ddd9 SHA1 4bab0e904d9950ba92e16b3932635e5a1c3edee1 SHA256 0da9630bbd28edee7538d857dbeefd6d4cdddafd198499e61513f2f4d44c2fc0 +MD5 b00446259b46a629379df5096e36a9a7 files/ghc-6.5-norelax.patch 613 +RMD160 71012d8615e164c72d0db75c8cc606ccf8e3ddd9 files/ghc-6.5-norelax.patch 613 +SHA256 0da9630bbd28edee7538d857dbeefd6d4cdddafd198499e61513f2f4d44c2fc0 files/ghc-6.5-norelax.patch 613 AUX ghc-6.6-nothreadedrts.patch 665 RMD160 402c8eb78dc648e55d1d7e00c695b49abe0f293d SHA1 8d0bc56096ebe781371dffa668de48a97173cd32 SHA256 bdfb000a70d97bb7341dda5a2ec48bb7f688532ade830eb2d73c7fa6ef1eead1 MD5 ec4b234602e907111db61eb1193c719e files/ghc-6.6-nothreadedrts.patch 665 RMD160 402c8eb78dc648e55d1d7e00c695b49abe0f293d files/ghc-6.6-nothreadedrts.patch 665 @@ -60,10 +60,10 @@ EBUILD ghc-6.6.ebuild 11720 RMD160 7f1c5df08ad07d9d1f141f0de8b79b59e51c2c8a SHA1 MD5 6266ba4cceae79830dfd3f61beee64ca ghc-6.6.ebuild 11720 RMD160 7f1c5df08ad07d9d1f141f0de8b79b59e51c2c8a ghc-6.6.ebuild 11720 SHA256 2a2cd111feb19caaf0d72bfe1dabe39396d9df61083c7edfbe44cb7c9babad20 ghc-6.6.ebuild 11720 -MISC ChangeLog 22227 RMD160 5024029915c383d3087ccfb6fb253b2518584bdb SHA1 0643240f36d423b8a8278c748b352cd8ce687bbc SHA256 8e7a96ffc90e0957bd0c2e51e8cda585d9d2dc5e269c4973f45600d53713c35e -MD5 3d9443c7a6dad3f9f10542f242b0d37c ChangeLog 22227 -RMD160 5024029915c383d3087ccfb6fb253b2518584bdb ChangeLog 22227 -SHA256 8e7a96ffc90e0957bd0c2e51e8cda585d9d2dc5e269c4973f45600d53713c35e ChangeLog 22227 +MISC ChangeLog 22338 RMD160 4c886318cb4610dc97ac6d732d39c0f5dd456448 SHA1 7bdc261a89ba02334b6d9595dc47063f72d40394 SHA256 014d035c88f28b0970ccd4ac48fa21830eae1b9711bd680097170c7e848b8d53 +MD5 db4cea9d126f99c1ccaa75118c119c65 ChangeLog 22338 +RMD160 4c886318cb4610dc97ac6d732d39c0f5dd456448 ChangeLog 22338 +SHA256 014d035c88f28b0970ccd4ac48fa21830eae1b9711bd680097170c7e848b8d53 ChangeLog 22338 MISC metadata.xml 223 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 SHA1 7b962c77f2e38479a9d1621ec8d307ca9f761753 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508 MD5 c694674dcbef799cd4fdb6914683ebff metadata.xml 223 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 metadata.xml 223 @@ -83,7 +83,7 @@ SHA256 8b741f3cf9b8a6a4d2ceb4d46316a3d3ba7bcbeba77c60ba6ee9748c063c2ac0 files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.7 (GNU/Linux) -iD8DBQFGk78vnUVyUObPUL4RAvrxAJ4pRskP5K2CsnwLYWIJBVfRMUquXwCfU9Uy -+CxWEjKMMoJN+OC2OcM8uZA= -=sPHh +iD8DBQFGlBhSnUVyUObPUL4RAobZAJwOL2mp6Y77uGH7gOD/WbJXRkXlXACfco7P +Feyp1i92neLan2TKG2ID/po= +=tqHn -----END PGP SIGNATURE----- diff --git a/dev-lang/ghc/files/ghc-6.5-norelax.patch b/dev-lang/ghc/files/ghc-6.5-norelax.patch index c11612df9d94..1941757b19f3 100644 --- a/dev-lang/ghc/files/ghc-6.5-norelax.patch +++ b/dev-lang/ghc/files/ghc-6.5-norelax.patch @@ -5,10 +5,10 @@ diff -rN -u old-ghc-1/compiler/main/DriverPipeline.hs new-ghc/compiler/main/Driv let ld_r args = SysTools.runLink dflags ([ SysTools.Option "-nostdlib", SysTools.Option "-nodefaultlibs", -+ #ifdef sparc_TARGET_ARCH ++#ifdef sparc_TARGET_ARCH + -- options '--relax' and '-r' are incompatible + SysTools.Option "-mno-relax", -+ #endif ++#endif SysTools.Option "-Wl,-r", SysTools.Option ld_x_flag, SysTools.Option "-o", |