diff options
| author | kristerw <kristerw@pkgsrc.org> | 2004-01-10 19:31:25 +0000 |
|---|---|---|
| committer | kristerw <kristerw@pkgsrc.org> | 2004-01-10 19:31:25 +0000 |
| commit | f6bbff098787209cb3104facc0057683fe60ef86 (patch) | |
| tree | 8948e671b8f7efed84541d69bc69b9cfc5512a7c /lang | |
| parent | fc001ebd5b2597189d6dc1f62f01a5c2eaf95e89 (diff) | |
| download | pkgsrc-f6bbff098787209cb3104facc0057683fe60ef86.tar.gz | |
Make the pkg build on -current.
Closes PR pkg/23441.
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/ghc/distinfo | 5 | ||||
| -rw-r--r-- | lang/ghc/patches/patch-af | 15 | ||||
| -rw-r--r-- | lang/ghc/patches/patch-at | 16 |
3 files changed, 31 insertions, 5 deletions
diff --git a/lang/ghc/distinfo b/lang/ghc/distinfo index b01b2f05654..798ff1b18c7 100644 --- a/lang/ghc/distinfo +++ b/lang/ghc/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.5 2004/01/03 09:40:26 kristerw Exp $ +$NetBSD: distinfo,v 1.6 2004/01/10 19:31:25 kristerw Exp $ SHA1 (ghc-5.04.3-src.tar.bz2) = 9b0f17e871557a76140fbf738138e1cf5d356e9d Size (ghc-5.04.3-src.tar.bz2) = 4741512 bytes @@ -9,7 +9,7 @@ SHA1 (patch-ab) = 5bfb4a4ce1cc46d789abad767f344909b149a640 SHA1 (patch-ac) = 106a7b195fdf563bcf43c2a5ef994917da94e17a SHA1 (patch-ad) = 8b8d10ca9e0ae3a82c2881624f4f6aae3402b13e SHA1 (patch-ae) = 4340eb154b8972625b36471f6cb373c390012817 -SHA1 (patch-af) = 1845d95b9d4fc49a075950ebfabfe4f9aa9e879a +SHA1 (patch-af) = 22370016af5a9b6ce2262e19057547adf29e25c8 SHA1 (patch-ag) = 0f0567ae53d577cc50796176f01f4f52c991999c SHA1 (patch-ah) = 9ec4a7f91bcfb6ad259c33a8c849ddd04902a210 SHA1 (patch-ai) = 501da9d7810b448d91723e6b5703df2af697304d @@ -23,3 +23,4 @@ SHA1 (patch-ap) = bd502c0d6957b6df6cd3d14b6b169d6a8edb46c6 SHA1 (patch-aq) = e4d71497a95923a069c3f8032359182c5705f3eb SHA1 (patch-ar) = 62a6db03a20a80be7c6b113cae5079de75c9665c SHA1 (patch-as) = 865a04de68667215ada3e0f27bdc18b8218178d7 +SHA1 (patch-at) = 92c2b6c48c6de57ec65b1908fa0b52cc091ab7d8 diff --git a/lang/ghc/patches/patch-af b/lang/ghc/patches/patch-af index 6fef94d29f1..b61287dfe79 100644 --- a/lang/ghc/patches/patch-af +++ b/lang/ghc/patches/patch-af @@ -1,7 +1,7 @@ -$NetBSD: patch-af,v 1.2 2003/04/29 11:27:44 augustss Exp $ +$NetBSD: patch-af,v 1.3 2004/01/10 19:31:25 kristerw Exp $ ---- ./ghc/driver/mangler/ghc-asm.lprl.orig Sun Dec 8 15:29:50 2002 -+++ ./ghc/driver/mangler/ghc-asm.lprl Fri Mar 28 23:48:01 2003 +--- ghc/driver/mangler/ghc-asm.lprl.orig 2002-12-08 15:29:50.000000000 +0100 ++++ ghc/driver/mangler/ghc-asm.lprl 2004-01-03 19:13:53.000000000 +0100 @@ -197,7 +197,7 @@ $T_hsc_cc_PAT = '\.string.*\)(hsc|cc) (.*)\\\\t(.*)"'; } @@ -11,3 +11,12 @@ $NetBSD: patch-af,v 1.2 2003/04/29 11:27:44 augustss Exp $ $T_DOT_GLOBAL = '\.globl'; $T_HDR_literal = "\.section\t\.rodata\n"; # or just use .text??? (WDP 95/11) $T_HDR_misc = "\.text\n\t\.align 4\n"; +@@ -1161,7 +1161,7 @@ + } + } + +- if ( $TargetPlatform !~ /^(alpha-|hppa|mips-|powerpc-apple-)/) { ++ if ( $TargetPlatform !~ /^(i386-|alpha-|hppa|mips-|powerpc-apple-)/) { + # On alphas, hppa: no very good way to look for "dangling" + # references to fast-entry point. + # (questionable re hppa and mips...) diff --git a/lang/ghc/patches/patch-at b/lang/ghc/patches/patch-at new file mode 100644 index 00000000000..c9900227e58 --- /dev/null +++ b/lang/ghc/patches/patch-at @@ -0,0 +1,16 @@ +$NetBSD: patch-at,v 1.1 2004/01/10 19:31:25 kristerw Exp $ + +--- ghc/compiler/main/DriverFlags.hc.orig Thu Jan 8 05:37:44 2004 ++++ ghc/compiler/main/DriverFlags.hc Thu Jan 8 05:39:45 2004 +@@ -12134,7 +12134,11 @@ + SET_HDR_(Hp-2,(P_)&stg_CAF_BLACKHOLE_info,0,0); + UPD_CAF(R1.p,Hp-2); + PUSH_UPD_FRAME(Hp-2,0); ++#if __GNUC__ <= 2 + R1.a="-fno-builtin"; ++#else ++R1.a="-fno-zero-initialized-in-bss"; ++#endif + Sp=Sp-3; + JMP_(GHCziBase_unpackCStringzh_fast1); + FE_ |